Commit Graph

58786 Commits

Author SHA1 Message Date
Craig Scott dc20dd3f44 Merge topic 'doc-export-compile-commands'
a28fb5980b Help:CMAKE_[CTEST,CPACK]_COMMAND]: correct copy-paste error
1ed074cf6d Help:CMAKE_EXPORT_COMPILE_COMMANDS: link to Ninja Generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7610
2022-08-26 06:47:08 -04:00
Craig Scott 4febca3e61 Merge topic 'doc-config-genex-version-note'
302b22450e Help: $<CONFIG:...> supports multiple configs only since CMake 3.19

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7607
2022-08-26 06:41:48 -04:00
Kitware Robot 71b7458f5b CMake Nightly Date Stamp 2022-08-26 00:01:13 -04:00
Kyle Edwards b9698ba3ca Merge branch 'release-3.24' 2022-08-25 09:14:22 -04:00
Kyle Edwards 2ef64745c8 Merge topic 'file-set-source-group'
970052fedd FILE_SET: Fix source group detection
bcc3965813 Tests: Fix VS10Project SourceGroupTreeCMakeLists check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7609
2022-08-25 09:14:21 -04:00
Kyle Edwards 32e6ee29d7 Merge topic 'file-set-source-group' into release-3.24
970052fedd FILE_SET: Fix source group detection
bcc3965813 Tests: Fix VS10Project SourceGroupTreeCMakeLists check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7609
2022-08-25 09:14:20 -04:00
Kitware Robot 9d1ecd72fb CMake Nightly Date Stamp 2022-08-25 00:01:07 -04:00
Michael Hirsch a28fb5980b Help:CMAKE_[CTEST,CPACK]_COMMAND]: correct copy-paste error 2022-08-24 21:32:15 -04:00
Michael Hirsch 1ed074cf6d Help:CMAKE_EXPORT_COMPILE_COMMANDS: link to Ninja Generators
compile_commands.json is generated for Ninja and Ninja Multi-Config
2022-08-24 21:28:45 -04:00
Kyle Edwards 970052fedd FILE_SET: Fix source group detection
Call MatchChildrenFiles() instead of MatchesFiles() in order to
account for files being in subgroups of source groups.

Fixes: #23880
2022-08-24 16:07:24 -04:00
Kyle Edwards bcc3965813 Tests: Fix VS10Project SourceGroupTreeCMakeLists check
Fix an `IN LISTS` loop, fix a variable check, and escape backslashes
in the regex used to search for source group names.
2022-08-24 16:07:24 -04:00
Michael Hirsch 302b22450e Help: $<CONFIG:...> supports multiple configs only since CMake 3.19 2022-08-24 15:29:06 +10:00
Kitware Robot 95dd428d5a CMake Nightly Date Stamp 2022-08-24 00:01:12 -04:00
Kyle Edwards eb86c99c4e Merge topic 'fix-presets-test-symlinked-build-dir'
ef0cd3dc40 Tests: Fix CMakePresets test in unusual environments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7598
2022-08-23 14:21:49 -04:00
Brad King 5936d4f2ad Merge topic 'block-management'
44a2f3f332 Add new flow-control commands for variables and policies scopes management
604993248f cmMakefile::VariablePushPop: helper class to manage variable scopes
3d94ee0e03 cmMakefile::RaiseScope: Add support for cmValue argument
553da0685f cmFunctionBlocker: Add handling of close block without parameters.
02c067dee5 cm::enum_set: fix various bugs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: John Ericson <git@johnericson.me>
Merge-request: !7575
2022-08-23 08:01:18 -04:00
Brad King 066b22b371 Merge topic 'target-prop-backtraces'
52c95540b7 target_*: Fix cross-directory call backtraces
0d64c3abd1 Tests: Add FileAPI case for cross-directory target_* commands
ef6a4240ba cmQtAutoGenInitializer: Drop unnecessary argument in AppendProperty call

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7602
2022-08-23 07:58:40 -04:00
Brad King b50a5ba456 Merge topic 'gitlab-ci-named-modules-msvc'
3490d7a9fc ci: Enable MSVC C++ module support tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7603
2022-08-23 07:49:22 -04:00
Kitware Robot 3c1771f5f0 CMake Nightly Date Stamp 2022-08-23 00:01:16 -04:00
Craig Scott a8b274c74e Merge topic 'bsd-variables'
a20d7a9707 BSD: Set *BSD variables when targeting a *BSD system
2ae42d0aa3 kFreeBSD: Do not unset LINUX variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7573
2022-08-22 17:37:49 -04:00
Brad King 3490d7a9fc ci: Enable MSVC C++ module support tests
Since commit b87645b6a5 (gitlab-ci: Update non-packaging Windows builds
to MSVC 14.33 toolset, 2022-08-18), the version of MSVC used in CI test
jobs supports the `cl -scanDependencies` functionality we need to
support C++ modules.  Enable the corresponding tests.
2022-08-22 16:50:51 -04:00
Brad King 52c95540b7 target_*: Fix cross-directory call backtraces
Record the call-site backtrace, not the current backtrace of the
target's directory.

Fixes: #23873
2022-08-22 15:29:43 -04:00
Brad King 0d64c3abd1 Tests: Add FileAPI case for cross-directory target_* commands
The backtraces for some of the commands incorrectly come from the
target's directory instead of the caller's directory.  Expect the
incorrect backtraces in test results for now.

Increase the minimum required version of CMake in the test case
to enable policy CMP0079 to support cross-directory calls.

Issue: #23873
2022-08-22 14:51:16 -04:00
Brad King ef6a4240ba cmQtAutoGenInitializer: Drop unnecessary argument in AppendProperty call
Prepare to add another optional argument.
2022-08-22 12:24:40 -04:00
Marc Chevrier 44a2f3f332 Add new flow-control commands for variables and policies scopes management
Add block() and endblock() commands offering the capability to create
new scopes for variables and/or policies.

Fixes: #20171
2022-08-22 16:25:53 +02:00
Marc Chevrier 604993248f cmMakefile::VariablePushPop: helper class to manage variable scopes 2022-08-22 16:25:53 +02:00
Marc Chevrier 3d94ee0e03 cmMakefile::RaiseScope: Add support for cmValue argument 2022-08-22 16:25:53 +02:00
Marc Chevrier 553da0685f cmFunctionBlocker: Add handling of close block without parameters. 2022-08-22 16:25:53 +02:00
Marc Chevrier 02c067dee5 cm::enum_set: fix various bugs 2022-08-22 16:25:53 +02:00
Brad King 7037cfc0f4 Merge branch 'release-3.24' 2022-08-22 09:46:29 -04:00
Brad King b9dd9b09a2 Merge topic 'ci-msvc-14.33'
b87645b6a5 gitlab-ci: Update non-packaging Windows builds to MSVC 14.33 toolset
cb8b27a901 gitlab-ci: Use separate MSVC toolset specification for packaging jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7597
2022-08-22 09:46:29 -04:00
Brad King 6fa11ecf03 Merge topic 'ci-msvc-14.33' into release-3.24
b87645b6a5 gitlab-ci: Update non-packaging Windows builds to MSVC 14.33 toolset
cb8b27a901 gitlab-ci: Use separate MSVC toolset specification for packaging jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7597
2022-08-22 09:46:28 -04:00
Kitware Robot 7f02daba64 CMake Nightly Date Stamp 2022-08-22 00:01:17 -04:00
Kitware Robot b634b8a83b CMake Nightly Date Stamp 2022-08-21 00:01:11 -04:00
Cristian Adam a20d7a9707 BSD: Set *BSD variables when targeting a *BSD system
Fixes: #23853
2022-08-21 09:27:59 +10:00
Cristian Adam 2ae42d0aa3 kFreeBSD: Do not unset LINUX variable
kFreeBSD is a Debian GNU distribution with a kernel from FreeBSD,
and should be marked as LINUX.
2022-08-21 09:27:35 +10:00
Craig Scott 9e884d4b46 Merge branch 'release-3.24' 2022-08-20 19:02:39 -04:00
Craig Scott c615095cf7 Merge topic 'doc-ctest_test-output-control'
68e1385a5c Merge branch 'backport-3.24-doc-ctest_test-output-control' into doc-ctest_test-output-control
fadc93286a Help: Add crossrefs to ctest output control options
de892f3d4e Help: Add crossrefs to ctest output control options
3453e6bd48 Merge branch 'backport-3.24-doc-ctest_test-output-control' into doc-ctest_test-output-control
8981e88b18 Help: Add missing closing quote on C++ example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7595
2022-08-20 19:02:39 -04:00
Craig Scott fb9c1c4cec Merge topic 'doc-ctest_test-output-control' into release-3.24
fadc93286a Help: Add crossrefs to ctest output control options
8981e88b18 Help: Add missing closing quote on C++ example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7595
2022-08-20 19:02:38 -04:00
Kitware Robot 6fef0a145c CMake Nightly Date Stamp 2022-08-20 00:01:14 -04:00
Matthew Woehlke ef0cd3dc40 Tests: Fix CMakePresets test in unusual environments
Tweak test in RunCMake/CMakePresets/GoodNoSCache.cmake to use the
canonical directory for comparison. This avoids an effectively spurious
test failure if the overall CMake build directory is a symlink.
2022-08-19 12:37:00 -04:00
Brad King b87645b6a5 gitlab-ci: Update non-packaging Windows builds to MSVC 14.33 toolset
Restore the change from commit 6f17996edc (gitlab-ci: Update Windows
builds to MSVC 14.33 toolset, 2022-08-15, v3.24.1~3^2), but not for
packaging jobs.  `cmake-gui` is still buggy when compiled with
the newer toolset.

Issue: #23859
2022-08-19 07:30:54 -04:00
Brad King cb8b27a901 gitlab-ci: Use separate MSVC toolset specification for packaging jobs
This will be useful for testing CMake with one version of MSVC
while packaging the official binaries with another version.

Issue: #23859
2022-08-19 07:30:42 -04:00
Brad King 7b9757e507 Merge topic 'cuda_mark_toolkit_includes_as_system'
ea659b155d CUDA: Always mark cuda toolkit as system include

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7476
2022-08-19 07:25:00 -04:00
Brad King d69d0316da Merge topic 'try_compile-clean-up-tests'
299cd3e6ab try_compile: Clean up tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7591
2022-08-19 07:22:41 -04:00
Brad King 6c7f3c839b Merge topic 'feature/cmake-man-page-short-option-first'
536a25fedc Help: Convenient declaration for `-j, --parallel` option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7588
2022-08-19 07:21:03 -04:00
Brad King fbef4c6ced Merge topic 'ci-linux-extdeps'
b55152e7ad gitlab-ci: add jobs to test CMake with external dependencies on Linux
6a05d107ca ci: add CMake external build dependencies to Debian and Fedora base images
d3c1b8a491 jsoncpp: Require version 1.6.0 when using system-provided library
68d3ca7008 Tests: Fix RunCMake.FileAPI test with jsoncpp < 1.7.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7592
2022-08-19 07:20:18 -04:00
Brad King 31d45782f0 Merge branch 'release-3.24' 2022-08-19 07:18:34 -04:00
Brad King d0a9602aca Merge topic 'doc-var-refs'
159acea394 Help: Clarify that variable references may use cache entries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7589
2022-08-19 07:18:34 -04:00
Brad King 1702759063 Merge topic 'doc-var-refs' into release-3.24
159acea394 Help: Clarify that variable references may use cache entries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7589
2022-08-19 07:18:33 -04:00
Brad King ce37b956eb Merge branch 'release-3.24' 2022-08-19 07:17:34 -04:00