mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-10 07:40:03 -06:00
Code Issues Packages Projects Releases Wiki Activity
56,787 Commits 2 Branches 385 Tags
baad545eb86e8ff729e7f36a26bf1251f8317e27
Commit Graph

32094 Commits

Author SHA1 Message Date
Kitware Robot
baad545eb8 CMake Nightly Date Stamp 2022-03-21 00:01:13 -04:00
Kitware Robot
2e80562b66 CMake Nightly Date Stamp 2022-03-20 00:01:08 -04:00
Kitware Robot
6657551482 CMake Nightly Date Stamp 2022-03-19 00:01:23 -04:00
Brad King
5dbd068827 Merge topic 'cmake-P-args' 
36056ff5a3 cmake: Improve acceptance of arbitrary arguments in -P script mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7083
 2022-03-18 07:20:24 -04:00
Brad King
32e40f7f53 Merge topic 'always_prefer_last_source_dir' 
b44ad7992a cmake: Always prefer the last source directory provided

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7084
 2022-03-18 07:16:24 -04:00
Kitware Robot
fafaca5fee CMake Nightly Date Stamp 2022-03-18 00:01:16 -04:00
Robert Maynard
b44ad7992a cmake: Always prefer the last source directory provided 
Fixes: #23334
 2022-03-17 15:23:01 -04:00
Brad King
36056ff5a3 cmake: Improve acceptance of arbitrary arguments in -P script mode 
The fix in commit e4f1b301fe (cmake: Allow arbitrary args passed to
CMake script, 2020-05-04, v3.18.0-rc1~211^2) only applied to "cache"
arguments like `-DFOO`.  Extend the fix to allow arbitrary arguments
that collide with other CMake arguments like `-S` and `-B`.
 2022-03-17 13:50:12 -04:00
Brad King
e56afbca89 Merge topic 'tll-genex-concat' 
add64399c5 target_link_libraries: Restore LINK_ONLY for multiple static lib dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7078
 2022-03-17 09:13:47 -04:00
Kitware Robot
c4f4981306 CMake Nightly Date Stamp 2022-03-17 00:01:18 -04:00
Brad King
4e54f56ebd Merge topic 'cm_cxx_filesystem.cxx-revert-erroneous-change' 
10689e564f cm_cxx_filesystem.cxx: revert erroneous change

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7072
 2022-03-16 11:22:09 -04:00
Brad King
add64399c5 target_link_libraries: Restore LINK_ONLY for multiple static lib dependencies 
Since commit c1e812ad4f (target_link_libraries: Improve tolerance of
unquoted generator expressions, 2022-02-15, v3.23.0-rc2~11^2) we
accumulate consecutive non-keyword arguments to recover an unquoted
generator expression as a single entry.  When given multiple consecutive
non-genex library names, the grouping breaks our logic that expects each
entry is either a raw target name or a genex.  Revise the logic to only
accumulate multiple arguments when they end inside a partial genex.

This bug caused `target_link_libraries` to stop wrapping static library
private dependencies in `$<LINK_ONLY:...>` for `INTERFACE_LINK_LIBRARIES`
when multiple consecutive library names are given.  Add a test case
covering that behavior.

Fixes: #23302
 2022-03-16 10:47:32 -04:00
Kitware Robot
ef0cdcf050 CMake Nightly Date Stamp 2022-03-16 00:01:16 -04:00
Brad King
03a2b524d3 Merge topic 'find_package-global-imported' 
f5bca247ee cmMakefile: Add missing initializer for recently added member

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7073
 2022-03-15 12:43:12 -04:00
Brad King
f5bca247ee cmMakefile: Add missing initializer for recently added member 
In commit 2f1ffa003c (find_package: Add support for default GLOBAL
imported targets, 2022-03-10) we added a field without an initializer.
This was exposed by a few failures in nightly testing.  Previously it
worked only by chance that the member's memory had suitable values.
 2022-03-15 11:23:32 -04:00
Marc Chevrier
10689e564f cm_cxx_filesystem.cxx: revert erroneous change 
Revert erroneous change introduced by commit 0a81ea1.
 2022-03-15 15:38:09 +01:00
Kitware Robot
486e87331a CMake Nightly Date Stamp 2022-03-15 00:01:18 -04:00
Kitware Robot
1422ff20aa CMake Nightly Date Stamp 2022-03-14 00:01:23 -04:00
Kitware Robot
6c6f3ceeaf CMake Nightly Date Stamp 2022-03-13 00:01:06 -05:00
Kitware Robot
de52151359 CMake Nightly Date Stamp 2022-03-12 00:01:19 -05:00
Brad King
96b7ca3576 Merge topic 'find_package-global-imported' 
2f1ffa003c find_package: Add support for default GLOBAL imported targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6862
 2022-03-11 08:54:36 -05:00
Brad King
edee7c18e8 Merge topic 'cuda-arch-native' 
d1b48bfabd CUDA: Add support for CUDA_ARCHITECTURES=native
632752d62e CUDA: Add FIXME comments about deferring architecture testing
45e9ab0372 Tests: Rename CudaOnly.{All => ArchSpecial}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7050
 2022-03-11 08:53:25 -05:00
Kitware Robot
d8f95471c7 CMake Nightly Date Stamp 2022-03-11 00:01:17 -05:00
John Parent
2f1ffa003c find_package: Add support for default GLOBAL imported targets 
Allow find package to promote scope of imported targets by specifying
an argument to `find_package` or by specifying a CMake variable.
    * Add support for CMAKE_GLOBAL_IMPORT_SCOPE variable
    * Add support for GLOBAL argument to find_package

Additionally add testing for above features.
 2022-03-10 12:44:36 -05:00
Brad King
d1b48bfabd CUDA: Add support for CUDA_ARCHITECTURES=native 
CUDA 11.6 added the `nvcc -arch=native` flag to automatically compile
for the host GPUs' architectures.  Add support for specifying this
special `native` value in `CMAKE_CUDA_ARCHITECTURES` and
`CUDA_ARCHITECTURES`.  During the compiler ABI detection step,
detect the native architectures so we can pass them explicitly
when using Clang or older versions of nvcc.

Fixes: #22375
 2022-03-10 09:27:29 -05:00
Brad King
736e80dbca CMake 3.23.0-rc3 2022-03-10 09:11:13 -05:00
Brad King
ab5baa32ad Merge topic 'ctest-WORKING_DIRECTORY' 
a116fd413d ctest: print WORKING_DIRECTORY property with -V

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7060
 2022-03-10 08:39:33 -05:00
Kitware Robot
a90849d3ef CMake Nightly Date Stamp 2022-03-10 00:01:21 -05:00
Kevin Puetz
a116fd413d ctest: print WORKING_DIRECTORY property with -V 2022-03-09 13:00:01 -06:00
Brad King
cbd36eac23 Merge topic 'ctest_truncate' 
140704d443 ctest: add option for output truncation
359e5b17d8 presets: bump version to v5
4634de335b cmCTestTestHandler: refactor CleanTestOutput method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6993
 2022-03-09 12:17:44 -05:00
Brad King
51e81d1f73 Merge topic 'color-diagnostics' 
6ab9fbd43b color: Add tests for CMAKE_COLOR_DIAGNOSTICS
78adb1b952 color: Add CMAKE_COLOR_DIAGNOSTICS environment variable
884d9de8b7 color: Introduce CMAKE_COLOR_DIAGNOSTICS variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Frank Dana <ferdnyc@gmail.com>
Merge-request: !6990
 2022-03-09 12:15:53 -05:00
Kitware Robot
8c852e4cd0 CMake Nightly Date Stamp 2022-03-09 00:01:15 -05:00
Semyon Kolton
884d9de8b7 color: Introduce CMAKE_COLOR_DIAGNOSTICS variable 
Add a variable to control both makefile color messages and compiler
color diagnostics.

Fixes: #15502
 2022-03-08 16:37:08 -05:00
Brad King
28f8b5cb0c Merge topic 'cmake-presets-file-dir' 
f54507c2f6 CMakePresets.json: Add ${fileDir} macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Gerhard Olsson <gerhard.nospam@gmail.com>
Merge-request: !7051
 2022-03-08 16:03:15 -05:00
Frank Winklmeier
140704d443 ctest: add option for output truncation 
Add `--test-output-truncation` to `ctest`. This option can be used to
customize which part of the test output is being truncated. Currently
supported values are `tail`, `middle` and `head`.

Also add equivalent `CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION` variable.

Fixes: #23206
 2022-03-08 08:18:02 -05:00
Frank Winklmeier
359e5b17d8 presets: bump version to v5 
Prepare for new test preset fields.
 2022-03-08 08:18:02 -05:00
Frank Winklmeier
4634de335b cmCTestTestHandler: refactor CleanTestOutput method 
Refactor the code to skip over UTF-8 multi-bytes into its own lambda
function so it can more easily be re-used.
 2022-03-08 08:08:20 -05:00
Kitware Robot
edc06246c4 CMake Nightly Date Stamp 2022-03-08 00:01:14 -05:00
Kyle Edwards
f54507c2f6 CMakePresets.json: Add ${fileDir} macro 
Fixes: #23214
 2022-03-07 18:03:16 -05:00
Brad King
5f7f9faada Merge topic 'while-errors' 
30313aa721 while: diagnose errors during condition evaluation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7045
 2022-03-07 09:59:34 -05:00
Kitware Robot
3df1f7ef71 CMake Nightly Date Stamp 2022-03-07 00:01:43 -05:00
Kitware Robot
6b6bdcbb64 CMake Nightly Date Stamp 2022-03-06 00:01:11 -05:00
Kitware Robot
5beaee81ef CMake Nightly Date Stamp 2022-03-05 00:01:22 -05:00
Brad King
30313aa721 while: diagnose errors during condition evaluation 
Add a policy to diagnose condition errors in a compatible way.

Fixes: #23296
 2022-03-04 13:55:12 -05:00
Brad King
89457cb8f0 Merge topic 'file-set-name-requirements' 
b357d334fc target_sources(): Enforce stricter requirements for FILE_SET name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7037
 2022-03-04 09:09:33 -05:00
Brad King
65da32c924 Merge topic 'file-set-name-requirements' into release-3.23 
b357d334fc target_sources(): Enforce stricter requirements for FILE_SET name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7037
 2022-03-04 09:09:31 -05:00
Brad King
0d8bb14344 Merge topic 'file-set-multiple-names' 
8c23ecbd93 target_sources(): Process multiple FILE_SET arguments per block

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7040
 2022-03-04 09:07:04 -05:00
Brad King
31743aaf5d Merge topic 'file-set-multiple-names' into release-3.23 
8c23ecbd93 target_sources(): Process multiple FILE_SET arguments per block

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7040
 2022-03-04 09:07:03 -05:00
Brad King
bb2477081d Merge topic 'while-bug-compatibility' 
da2361ffb3 while: Restore tolerance of condition error
47d197745a Tests: Simplify RunCMake.{if,while} unbalanced parenthesis cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7041
 2022-03-04 08:53:17 -05:00
Brad King
d7febfc727 Merge topic 'while-bug-compatibility' into release-3.23 
da2361ffb3 while: Restore tolerance of condition error
47d197745a Tests: Simplify RunCMake.{if,while} unbalanced parenthesis cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7041
 2022-03-04 08:53:16 -05:00