summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'backport-3.24-Link-MACOSX_BUNDLE' into Link-MACOSX_BUNDLEMarc Chevrier2022-08-316-0/+45
|\
| * Xcode: Fix erroneous MACOSX_BUNDLE linkMarc Chevrier2022-08-316-0/+45
| | | | | | | | | | | | | | | | Refactoring in commit a2cfa2da4f (GenEx/LINK_LIBRARY: Add features for framework support on Apple, 2022-02-10, v3.24.0-rc1~661^2) accidentally removed a `GetParentDirectory` call. Restore it. Fixes: #23891
* | CMake Nightly Date StampKitware Robot2022-08-311-1/+1
| |
* | CMake Nightly Date StampKitware Robot2022-08-301-1/+1
| |
* | CMake Nightly Date StampKitware Robot2022-08-291-1/+1
| |
* | Merge topic 'c-d-argument-order-doc'Craig Scott2022-08-281-0/+19
|\ \ | | | | | | | | | | | | | | | | | | b2d07c3297 Help: Clarify that the order of -C and -D arguments matters Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7614
| * | Help: Clarify that the order of -C and -D arguments mattersKyle Edwards2022-08-261-0/+19
| | |
* | | CMake Nightly Date StampKitware Robot2022-08-281-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2022-08-271-1/+1
|/ /
* | Merge topic 'file-DOWNLOAD-existing-file-matched-message'Craig Scott2022-08-262-3/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | 666b3c6f13 Help: Clarify file(DOWNLOAD) behavior for existing file with same hash 87a40b720a file(DOWNLOAD): Fix message for existing file with matching hash Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7599
| * | Help: Clarify file(DOWNLOAD) behavior for existing file with same hashMichael Hirsch2022-08-231-2/+5
| | |
| * | file(DOWNLOAD): Fix message for existing file with matching hashMichael Hirsch2022-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | file(DOWNLOAD STATUS) docs say the return list is of length 2. However, when an already downloaded file hash matches EXPECTED_HASH, the return message had a semicolon that made the return list length 3. Adjust the message to no longer contain the extra semicolon and to more clearly describe the situation.
* | | Merge branch 'release-3.24'Craig Scott2022-08-260-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'correct_cupti_search_paths' into release-3.24Craig Scott2022-08-261-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 1f3c3589f1 FindCUDAToolkit: Search the cuda toolkit include path for cupti Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7608
* | \ \ Merge topic 'correct_cupti_search_paths'Craig Scott2022-08-261-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 1f3c3589f1 FindCUDAToolkit: Search the cuda toolkit include path for cupti Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7608
| * | | FindCUDAToolkit: Search the cuda toolkit include path for cuptiRobert Maynard2022-08-241-1/+1
| | | |
* | | | Merge topic 'doc-export-compile-commands'Craig Scott2022-08-263-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Help:CMAKE_[CTEST,CPACK]_COMMAND]: correct copy-paste errorMichael Hirsch2022-08-252-6/+6
| | | | |
| * | | | Help:CMAKE_EXPORT_COMPILE_COMMANDS: link to Ninja GeneratorsMichael Hirsch2022-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | compile_commands.json is generated for Ninja and Ninja Multi-Config
* | | | | Merge topic 'doc-config-genex-version-note'Craig Scott2022-08-261-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 302b22450e Help: $<CONFIG:...> supports multiple configs only since CMake 3.19 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7607
| * | | | | Help: $<CONFIG:...> supports multiple configs only since CMake 3.19Michael Hirsch2022-08-241-0/+4
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2022-08-261-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.24'Kyle Edwards2022-08-250-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'file-set-source-group' into release-3.24Kyle Edwards2022-08-258-5/+44
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ Merge topic 'file-set-source-group'Kyle Edwards2022-08-258-5/+44
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | FILE_SET: Fix source group detectionKyle Edwards2022-08-246-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call MatchChildrenFiles() instead of MatchesFiles() in order to account for files being in subgroups of source groups. Fixes: #23880
| * | | | | | Tests: Fix VS10Project SourceGroupTreeCMakeLists checkKyle Edwards2022-08-242-4/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fix an `IN LISTS` loop, fix a variable check, and escape backslashes in the regex used to search for source group names.
* | | | | | CMake Nightly Date StampKitware Robot2022-08-251-1/+1
| |_|/ / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2022-08-241-1/+1
| |/ / / |/| | |
* | | | Merge topic 'fix-presets-test-symlinked-build-dir'Kyle Edwards2022-08-231-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef0cd3dc40 Tests: Fix CMakePresets test in unusual environments Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7598
| * | | | Tests: Fix CMakePresets test in unusual environmentsMatthew Woehlke2022-08-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge topic 'block-management'Brad King2022-08-2372-21/+814
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Add new flow-control commands for variables and policies scopes managementMarc Chevrier2022-08-2266-12/+750
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add block() and endblock() commands offering the capability to create new scopes for variables and/or policies. Fixes: #20171
| * | | | | cmMakefile::VariablePushPop: helper class to manage variable scopesMarc Chevrier2022-08-222-0/+27
| | | | | |
| * | | | | cmMakefile::RaiseScope: Add support for cmValue argumentMarc Chevrier2022-08-221-0/+4
| | | | | |
| * | | | | cmFunctionBlocker: Add handling of close block without parameters.Marc Chevrier2022-08-222-4/+16
| | | | | |
| * | | | | cm::enum_set: fix various bugsMarc Chevrier2022-08-222-5/+17
| | |_|_|/ | |/| | |
* | | | | Merge topic 'target-prop-backtraces'Brad King2022-08-2333-64/+268
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | target_*: Fix cross-directory call backtracesBrad King2022-08-2211-76/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Record the call-site backtrace, not the current backtrace of the target's directory. Fixes: #23873
| * | | | | Tests: Add FileAPI case for cross-directory target_* commandsBrad King2022-08-2222-33/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | cmQtAutoGenInitializer: Drop unnecessary argument in AppendProperty callBrad King2022-08-221-2/+1
| |/ / / / | | | | | | | | | | | | | | | Prepare to add another optional argument.
* | | | | Merge topic 'gitlab-ci-named-modules-msvc'Brad King2022-08-234-0/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | ci: Enable MSVC C++ module support testsBrad King2022-08-224-0/+15
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | CMake Nightly Date StampKitware Robot2022-08-231-1/+1
| | | | |
* | | | | Merge topic 'bsd-variables'Craig Scott2022-08-2212-2/+54
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | BSD: Set *BSD variables when targeting a *BSD systemCristian Adam2022-08-2011-0/+52
| | | | | | | | | | | | | | | | | | | | Fixes: #23853
| * | | | kFreeBSD: Do not unset LINUX variableCristian Adam2022-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | kFreeBSD is a Debian GNU distribution with a kernel from FreeBSD, and should be marked as LINUX.
* | | | | Merge branch 'release-3.24'Brad King2022-08-220-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'ci-msvc-14.33' into release-3.24Brad King2022-08-222-23/+44
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ Merge topic 'ci-msvc-14.33'Brad King2022-08-222-23/+44
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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