Commit Graph

58758 Commits

Author SHA1 Message Date
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
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
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
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
Brad King
dc4c0e29a4 Merge topic 'ci-cmake-update'
05a1464689 ci: use CMake 3.24.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7590
2022-08-19 07:17:34 -04:00
Brad King
810ab9b24d Merge topic 'ci-cmake-update' into release-3.24
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
2022-08-19 07:17:33 -04:00
Craig Scott
68e1385a5c Merge branch 'backport-3.24-doc-ctest_test-output-control' into doc-ctest_test-output-control 2022-08-19 14:47:42 +10:00
Craig Scott
fadc93286a Help: Add crossrefs to ctest output control options 2022-08-19 14:47:01 +10:00
Craig Scott
de892f3d4e Help: Add crossrefs to ctest output control options 2022-08-19 14:45:36 +10:00
Craig Scott
3453e6bd48 Merge branch 'backport-3.24-doc-ctest_test-output-control' into doc-ctest_test-output-control 2022-08-19 14:30:50 +10:00
Craig Scott
8981e88b18 Help: Add missing closing quote on C++ example 2022-08-19 14:03:18 +10:00
Kitware Robot
26f824f0fa CMake Nightly Date Stamp 2022-08-19 00:01:12 -04:00
Brad King
b55152e7ad gitlab-ci: add jobs to test CMake with external dependencies on Linux
Test that CMake works without its bundled dependencies.
For some dependencies, test using the minimum supported version.
2022-08-18 15:49:08 -04:00
Brad King
6a05d107ca ci: add CMake external build dependencies to Debian and Fedora base images 2022-08-18 15:49:08 -04:00
Brad King
d3c1b8a491 jsoncpp: Require version 1.6.0 when using system-provided library
We need the `ValueIterator::name()` method.
2022-08-18 15:49:08 -04:00
Brad King
68d3ca7008 Tests: Fix RunCMake.FileAPI test with jsoncpp < 1.7.5
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.
2022-08-18 15:49:07 -04:00
Matthew Woehlke
299cd3e6ab try_compile: Clean up tests
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.
2022-08-18 11:27:27 -04:00
Robert Maynard
ea659b155d CUDA: Always mark cuda toolkit as system include
Fixes: #23731
2022-08-18 10:37:06 -04:00
Brad King
05a1464689 ci: use CMake 3.24.1 2022-08-18 10:01:20 -04:00
Brad King
159acea394 Help: Clarify that variable references may use cache entries
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
2022-08-18 09:04:08 -04:00
Brad King
36d35d4eb1 Merge topic 'cmake-E-env-modify'
c9d70a7cc3 cmake -E env: Add --modify flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7571
2022-08-18 08:04:06 -04:00
Brad King
a2cf0db74b Merge topic 'try_compile-no-try_run-args'
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
2022-08-18 08:01:02 -04:00
Brad King
a336c83520 Merge topic 'argparse-positional-tweak'
f2ef60ca54 cmArgumentParser: Ignore positional after keyword

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7584
2022-08-18 07:58:54 -04:00
Brad King
eee5616336 Merge topic 'create_test_sourcelist-special-chars'
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
2022-08-18 07:57:48 -04:00
Alex Turbov
536a25fedc Help: Convenient declaration for -j, --parallel option 2022-08-18 14:18:49 +04:00
Kitware Robot
b59615e924 CMake Nightly Date Stamp 2022-08-18 00:01:11 -04:00
Matthew Woehlke
b976b844d2 try_compile: Don't accept try_run arguments
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.
2022-08-17 15:44:35 -04:00
Matthew Woehlke
24c83bb35b try_compile: Fix quotes in reporting of unknown arguments
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.
2022-08-17 15:44:29 -04:00
Klaas Speller
f0802b2f50 create_test_sourcelist: Add support for more special characters in paths
Use `cmSystemTools::MakeCidentifier` to robustly create a valid function
name to which the test path maps.

Fixes: #23855
2022-08-17 15:34:41 -04:00
Brad King
c88bf61c8d Merge topic 'fortran-compiler-list'
35759e2497 Fortran: cleanup compiler default search list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7548
2022-08-17 14:19:33 -04:00
Brad King
0677ca5cfc Merge branch 'release-3.24' 2022-08-17 14:18:29 -04:00
Brad King
c3793b4157 CMake 3.24.1 v3.24.1 2022-08-17 12:54:57 -04:00