mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-20 21:28:23 -05:00
Code Issues Packages Projects Releases Wiki Activity
57,495 Commits 2 Branches 399 Tags
cb19a634994aec41a070633e2b574bee4a5c5568
Commit Graph

32362 Commits

Author SHA1 Message Date
Alex Turbov cb19a63499 cmConditionEvaluator: Reduce the scope of the CMP0064 evaluation 
When evaluatig conditions, avoid testing CMP0064 unless it's really needed
(Cuz most of the time it doesn't)
 2022-05-23 09:08:51 -04:00
Brad King 758756d1ba Merge topic 'ignore-werror-command-arg' 
65f7053d6c COMPILE_WARNING_AS_ERROR: Add command-line option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7268
 2022-05-19 09:43:53 -04:00
Brad King f808b19020 Merge topic 'verify-interface-header-sets' 
259c265112 VERIFY_HEADER_SETS: Rename to VERIFY_INTERFACE_HEADER_SETS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7279
 2022-05-19 09:41:52 -04:00
Kitware Robot 80c2b994d6 CMake Nightly Date Stamp 2022-05-19 00:01:09 -04:00
Martin Duffy 65f7053d6c COMPILE_WARNING_AS_ERROR: Add command-line option 
Add command-line option `--compile-no-warning-as-error` to ignore value of
`COMPILE_WARNING_AS_ERROR`.

Issue: #19085
 2022-05-18 10:30:30 -04:00
Kyle Edwards 259c265112 VERIFY_HEADER_SETS: Rename to VERIFY_INTERFACE_HEADER_SETS 
Issue: #23448
 2022-05-18 10:18:40 -04:00
Brad King 114acce9a1 Merge topic 'ccmake-fix-infinite-loop-search' 
432a8ab739 ccmake: Fix infinite loop during invalid search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7269
 2022-05-18 08:43:31 -04:00
Martin Duffy 432a8ab739 ccmake: Fix infinite loop during invalid search 
Fix issue introduced in commit 2defe9ff95 (ccmake: Fix crash when
deleting all cache entries, 2022-05-12).

Leaving the Empty Cache widget always on the Entry list had unforeseen
consequences, including that it caused an infinite loop when searching
for a string that did not match any variables.
 2022-05-18 08:04:10 -04:00
Kitware Robot 9f469d533d CMake Nightly Date Stamp 2022-05-18 00:01:10 -04:00
Brad King a7cd15a61c Merge topic 'try_compile-project-platform-vars' 
a6562ff579 try_compile: Add option to skip passing platform variables
4843a37676 try_compile: Propagate platform variables in project-mode too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7265
 2022-05-17 08:57:55 -04:00
Brad King 2adfa82e28 Merge topic 'install-all-components-fix' 
b0c8e31b54 install: Don't ignore EXCLUDE_FROM_ALL when used with ALL_COMPONENTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7263
 2022-05-17 08:50:33 -04:00
Kitware Robot 943210856a CMake Nightly Date Stamp 2022-05-17 00:01:08 -04:00
Brad King a6562ff579 try_compile: Add option to skip passing platform variables 
Add a `CMAKE_TRY_COMPILE_NO_PLATFORM_VARIABLES` variable to tell
`try_compile` not to pass platform variables to the test project.

Issue: #23219
 2022-05-16 10:47:21 -04:00
Brad King 4843a37676 try_compile: Propagate platform variables in project-mode too 
Add policy CMP0137 to propagate both our builtin variables and those
listed by `CMAKE_TRY_COMPILE_PLATFORM_VARIABLES` to `try_compile`
whole-project builds.

Inspired-by: Alexander Neumann <Alexander.Neumann@hamburg.de>
Fixes: #23219
 2022-05-16 10:39:42 -04:00
Nils Gladitz b0c8e31b54 install: Don't ignore EXCLUDE_FROM_ALL when used with ALL_COMPONENTS 
Fixes: #23494
 2022-05-16 09:34:31 -04:00
Brad King c4ed5341c4 Merge topic 'CMAKE_PROJECT_TOP_LEVEL_INCLUDES' 
a6c34b0353 project(): Add new CMAKE_PROJECT_TOP_LEVEL_INCLUDES file injection point
8aa29a1793 CMakeDetermineSystem: Remove unreachable code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7250
 2022-05-16 09:26:59 -04:00
Brad King a9a93b1e33 Merge topic 'cuda-arch-off-vs' 
9fe41ecf36 VS: Fix CUDA CodeGeneration field for CMAKE_CUDA_ARCHITECTURES=OFF

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7261
 2022-05-16 09:24:53 -04:00
Brad King 29d23ec2cf Merge topic 'cuda-arch-off-vs' into release-3.23 
9fe41ecf36 VS: Fix CUDA CodeGeneration field for CMAKE_CUDA_ARCHITECTURES=OFF

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7261
 2022-05-16 09:24:52 -04:00
Kitware Robot c51d9550e7 CMake Nightly Date Stamp 2022-05-16 00:01:14 -04:00
Kitware Robot dc3d0b5a0a CMake Nightly Date Stamp 2022-05-15 00:01:08 -04:00
Kitware Robot de57770901 CMake Nightly Date Stamp 2022-05-14 00:01:08 -04:00
Brad King 9fe41ecf36 VS: Fix CUDA CodeGeneration field for CMAKE_CUDA_ARCHITECTURES=OFF 
If we add no CUDA architecture flags, write an empty `CodeGeneration`
field to tell the CUDA Toolkit's VS integration not to add its default
flags.  We already use this approach for `CMAKE_CUDA_ARCHITECTURES=all`
so that the `-arch=all` flag can be added via `AdditionalOptions`.

Fixes: #23490
 2022-05-13 11:34:51 -04:00
Brad King e00e67cb92 Merge topic 'presets-pathListSep' 
ba969ce5fe cmake-presets: add ${pathListSep} macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7234
 2022-05-13 08:54:08 -04:00
Brad King 57559d2848 Merge topic 'ccmake-delete-cache' 
2defe9ff95 ccmake: Fix crash when deleting all cache entries
e1c85e29f4 ccmake: Move Initialization of Fields Inline

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7257
 2022-05-13 08:45:51 -04:00
Craig Scott a6c34b0353 project(): Add new CMAKE_PROJECT_TOP_LEVEL_INCLUDES file injection point 
Fixes: #22685
 2022-05-13 18:03:36 +10:00
Kitware Robot ef0727f277 CMake Nightly Date Stamp 2022-05-13 00:01:07 -04:00
Martin Duffy 2defe9ff95 ccmake: Fix crash when deleting all cache entries 
Prevents crash when deleting all cache entries.
Additionally, if advanced entries are hidden, no longer show the first advanced
entry when deleting all visible entries.

Fixes: #23499
 2022-05-12 16:43:15 -04:00
Martin Duffy e1c85e29f4 ccmake: Move Initialization of Fields Inline 
Move initialization of simple fields in cmCursesMainForm inline.
 2022-05-12 16:40:58 -04:00
Erin Melucci ba969ce5fe cmake-presets: add ${pathListSep} macro 
Fixes: #23282
 2022-05-12 10:37:49 -04:00
Kitware Robot f46c67de0e CMake Nightly Date Stamp 2022-05-12 00:01:04 -04:00
Kitware Robot 364fde65ee CMake Nightly Date Stamp 2022-05-11 00:01:06 -04:00
Brad King 79b64690d9 Merge topic 'werror-property' 
76a08cd253 COMPILE_WARNING_AS_ERROR: Add options to treat warnings as errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Michael Hirsch <michael@scivision.dev>
Merge-request: !7187
 2022-05-10 10:30:42 -04:00
Brad King 54c3563e95 Merge topic 'watcom-runtime-library-v2' 
6a2b016bbd OpenWatcom: Support CMAKE_WATCOM_RUNTIME_LIBRARY with Linux and OS/2 builds
33da5824ac OpenWatcom: Allow specifying the runtime library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7184
 2022-05-10 10:27:15 -04:00
Kitware Robot 02b4cd9827 CMake Nightly Date Stamp 2022-05-10 00:01:04 -04:00
Kitware Robot cf6235719b CMake Nightly Date Stamp 2022-05-09 00:01:15 -04:00
Kitware Robot b541073a44 CMake Nightly Date Stamp 2022-05-08 00:01:04 -04:00
Kitware Robot ddfa4372f7 CMake Nightly Date Stamp 2022-05-07 00:01:12 -04:00
Kyle Edwards 7dc5824960 Merge topic 'json-pass-state' 
7b7fc2df0b cmJSONHelpers: Allow passing state context
30336dab66 cmJSONHelpers: Restructure cmJSONHelpers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7231
 2022-05-06 12:30:44 -04:00
Martin Duffy 76a08cd253 COMPILE_WARNING_AS_ERROR: Add options to treat warnings as errors 
Add `COMPILE_WARNING_AS_ERROR` target property and supporting
`CMAKE_COMPILE_WARNING_AS_ERROR` variable.

`COMPILE_WARNING_AS_ERROR` is initialized by
`CMAKE_COMPILE_WARNING_AS_ERROR`. It is a boolean variable. If it is
true, it expands to a different flag depending on the compiler such that
any warnings at compile will be treated as errors.

Supports compiler ids that I could find a relevant flag for.
 2022-05-06 12:14:37 -04:00
Cameron Cawley 33da5824ac OpenWatcom: Allow specifying the runtime library 
Add a `CMAKE_WATCOM_RUNTIME_LIBRARY` variable to control the
runtime library selection.  Add policy CMP0136 to switch to
in place of the old hard-coded default flags.

Fixes: #23178
 2022-05-06 10:40:58 -04:00
Brad King e36599f8b0 Merge topic 'try_compile-platform-vars' 
40f380fcb0 cmCoreTryCompile: Replace vector push_back with emplace_back
c6b0657f5b cmCoreTryCompile: Move platform variable forwarding to dedicated block

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7243
 2022-05-06 08:59:00 -04:00
Craig Scott c5dff5ace2 Merge topic 'FetchContent_find_package_integration' 
29e31e2825 Packages: Integrate FetchContent and find_package()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: huangqinjin <huangqinjin@gmail.com>
Merge-request: !5688
 2022-05-06 08:33:38 -04:00
Kitware Robot 30f9159667 CMake Nightly Date Stamp 2022-05-06 00:01:08 -04:00
Martin Duffy 7b7fc2df0b cmJSONHelpers: Allow passing state context 
Allow for passing of context to JSON Helper methods in cmJSONHelpers.
 2022-05-05 12:12:53 -04:00
Martin Duffy 30336dab66 cmJSONHelpers: Restructure cmJSONHelpers 
Restructure cmJSONHelpers to prevent SunPro errors when passing context.
 2022-05-05 12:12:12 -04:00
Brad King 40f380fcb0 cmCoreTryCompile: Replace vector push_back with emplace_back 2022-05-05 11:23:40 -04:00
Brad King c6b0657f5b cmCoreTryCompile: Move platform variable forwarding to dedicated block 
Prepare to enable the behavior under more conditions.

Issue: #23219
 2022-05-05 11:23:12 -04:00
Brad King 7d78dcbebb Merge topic 'cpack-wix-arch' 
cae7e5e38d CPack/WIX: Add CPACK_WIX_ARCHITECTURE to support Windows for ARM installers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7236
 2022-05-05 09:31:46 -04:00
Brad King cd20592c6d Merge topic 'ExternalProject-no-extract-timestamp' 
a283e58b51 ExternalProject: Add DOWNLOAD_EXTRACT_TIMESTAMP option and policy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7137
 2022-05-05 09:20:41 -04:00
Brad King f533b548ca Merge topic 'remove-PackageMaker-generator' 
c150f89f4d CPack: Remove the deprecated PackageMaker generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7221
 2022-05-05 09:17:35 -04:00