summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 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
| * | gitlab-ci: Update non-packaging Windows builds to MSVC 14.33 toolsetBrad King2022-08-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | gitlab-ci: Use separate MSVC toolset specification for packaging jobsBrad King2022-08-192-19/+40
| | | | | | | | | | | | | | | | | | | | | This will be useful for testing CMake with one version of MSVC while packaging the official binaries with another version. Issue: #23859
* | | CMake Nightly Date StampKitware Robot2022-08-221-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2022-08-211-1/+1
| | |
* | | Merge branch 'release-3.24'Craig Scott2022-08-200-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'doc-ctest_test-output-control' into release-3.24Craig Scott2022-08-201-2/+5
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | 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
* | | Merge topic 'doc-ctest_test-output-control'Craig Scott2022-08-201-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ Merge branch 'backport-3.24-doc-ctest_test-output-control' into ↵Craig Scott2022-08-190-0/+0
| |\ \ \ | | | |/ | | |/| | | | | doc-ctest_test-output-control
| | * | Help: Add crossrefs to ctest output control optionsCraig Scott2022-08-191-1/+4
| | | |
| * | | Help: Add crossrefs to ctest output control optionsCraig Scott2022-08-191-1/+5
| | | |
| * | | Merge branch 'backport-3.24-doc-ctest_test-output-control' into ↵Craig Scott2022-08-191-1/+1
| |\ \ \ | | |/ / | | | | | | | | doc-ctest_test-output-control
| | * | Help: Add missing closing quote on C++ exampleCraig Scott2022-08-191-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2022-08-201-1/+1
| | | |
* | | | Merge topic 'cuda_mark_toolkit_includes_as_system'Brad King2022-08-196-6/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea659b155d CUDA: Always mark cuda toolkit as system include Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7476
| * | | | CUDA: Always mark cuda toolkit as system includeRobert Maynard2022-08-186-6/+31
| | | | | | | | | | | | | | | | | | | | Fixes: #23731
* | | | | Merge topic 'try_compile-clean-up-tests'Brad King2022-08-191-36/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 299cd3e6ab try_compile: Clean up tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7591
| * | | | | try_compile: Clean up testsMatthew Woehlke2022-08-181-36/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch order of one try_compile test so that the total set of tests is in a more sensible order. Remove two duplicate tests. Remove some gratuitous (and not entirely accurate) messages.
* | | | | | Merge topic 'feature/cmake-man-page-short-option-first'Brad King2022-08-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 536a25fedc Help: Convenient declaration for `-j, --parallel` option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7588
| * | | | | | Help: Convenient declaration for `-j, --parallel` optionAlex Turbov2022-08-181-1/+1
| | | | | | |
* | | | | | | Merge topic 'ci-linux-extdeps'Brad King2022-08-1919-7/+191
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | gitlab-ci: add jobs to test CMake with external dependencies on LinuxBrad King2022-08-1812-2/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test that CMake works without its bundled dependencies. For some dependencies, test using the minimum supported version.
| * | | | | | | ci: add CMake external build dependencies to Debian and Fedora base imagesBrad King2022-08-184-3/+45
| | | | | | | |
| * | | | | | | jsoncpp: Require version 1.6.0 when using system-provided libraryBrad King2022-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need the `ValueIterator::name()` method.
| * | | | | | | Tests: Fix RunCMake.FileAPI test with jsoncpp < 1.7.5Brad King2022-08-183-1/+12
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to jsoncpp commit `126bdc2b05` (Reject extra chars if strictRoot, 2016-08-21, 1.7.5~2), it did not diagnose trailing characters in the input after a JSON value. Teach our corresponding test case to tolerate the old behavior.
* | | | | | | Merge branch 'release-3.24'Brad King2022-08-190-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge topic 'doc-var-refs' into release-3.24Brad King2022-08-191-6/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 159acea394 Help: Clarify that variable references may use cache entries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7589
* | \ \ \ \ \ \ Merge topic 'doc-var-refs'Brad King2022-08-191-6/+8
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 159acea394 Help: Clarify that variable references may use cache entries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7589
| * | | | | | | Help: Clarify that variable references may use cache entriesBrad King2022-08-181-6/+8
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify in `cmake-language(7)` that a variable lookup may use a cache entry if the variable is not set. Fix misleading text in added by commit 8ba2a8d4a4 (Help: short/long variable reference in if command, 2018-11-01, v3.14.0-rc1~408^2~2). Fixes: #23863
* | | | | | | Merge branch 'release-3.24'Brad King2022-08-190-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'ci-cmake-update' into release-3.24Brad King2022-08-194-9/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05a1464689 ci: use CMake 3.24.1 c3793b4157 CMake 3.24.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7590
* | \ \ \ \ \ \ Merge topic 'ci-cmake-update'Brad King2022-08-192-6/+6
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 05a1464689 ci: use CMake 3.24.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7590
| * | | | | | ci: use CMake 3.24.1Brad King2022-08-182-6/+6
| | |/ / / / | |/| | | |
* | | | | | CMake Nightly Date StampKitware Robot2022-08-191-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'cmake-E-env-modify'Brad King2022-08-1819-6/+152
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9d70a7cc3 cmake -E env: Add --modify flag Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7571
| * | | | | cmake -E env: Add --modify flagAlex Reinking2022-08-1719-6/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `cmake -E env` is given the `--modify` flag, try to parse the following argument as an `ENVIRONMENT_MODIFICATION` operation and apply it to the environment. This generalizes `--unset=`: 1. When implementing `ENVIRONMENT_MODIFICATION` features for other CMake commands, the `MYVAR=OP:VALUE` strings do not need to be translated to OP-specific flags. 2. This provides a natural and consistent extension point to introduce new operations without introducing very many flags. 3. Users need to learn only one syntax to access the same functionality. There is one difference between the behavior here as compared to CTest's interpretation of the `ENVIRONMENT_MODIFICATION` test property. The `MYVAR=reset:` command when run in `cmake -E env` will reset `MYVAR` to whatever its value was when `cmake -E env` launched, rather than try to checkpoint after plain `MYVAR=VALUE` options. This makes `MYVAR=VALUE` and `--modify MYVAR=set:VALUE` semantically equivalent.
* | | | | | Merge topic 'try_compile-no-try_run-args'Brad King2022-08-182-35/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b976b844d2 try_compile: Don't accept try_run arguments 24c83bb35b try_compile: Fix quotes in reporting of unknown arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7585
| * | | | | | try_compile: Don't accept try_run argumentsMatthew Woehlke2022-08-172-34/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify cmCoreTryCompile to only recognize try_run arguments when actually parsing try_run. (The old behavior was to recognize try_run arguments for try_compile also and then complain.) This has a small chance that a try_run keyword will be consumed as part of a multi-valued keyword argument. However, this behavior is more consistent with other commands, as we don't normally treat keywords as universally reserved. Also, the code is noticeably simplified.
| * | | | | | try_compile: Fix quotes in reporting of unknown argumentsMatthew Woehlke2022-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 6b427d8da9 (cmCoreTryCompile: Port to cmArgumentParser, 2022-08-01) we inadvertently dropped a matching quote during refactoring of reporting unknown arguments given to try_compile/try_run. Add the missing quote to match the old behavior and not have an imbalanced quote in the warning.
* | | | | | | Merge topic 'argparse-positional-tweak'Brad King2022-08-183-10/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2ef60ca54 cmArgumentParser: Ignore positional after keyword Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7584
| * | | | | | | cmArgumentParser: Ignore positional after keywordMatthew Woehlke2022-08-173-10/+23
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tweak cmArgumentParser to ignore positional arguments once a keyword argument has been seen. This prevents mingling of keyword arguments being able to effectively skip positional arguments, with later arguments being picked up again; this seems highly likely to lead to user confusion. This is also consistent with how other languages (e.g. Python) handle a mix of "named" and positional arguments.
* | | | | | | Merge topic 'create_test_sourcelist-special-chars'Brad King2022-08-181-3/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0802b2f50 create_test_sourcelist: Add support for more special characters in paths Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7587
| * | | | | | create_test_sourcelist: Add support for more special characters in pathsKlaas Speller2022-08-171-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `cmSystemTools::MakeCidentifier` to robustly create a valid function name to which the test path maps. Fixes: #23855
* | | | | | | CMake Nightly Date StampKitware Robot2022-08-181-1/+1
| | | | | | |
* | | | | | | Merge topic 'fortran-compiler-list'Brad King2022-08-171-25/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35759e2497 Fortran: cleanup compiler default search list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7548