mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity
58,069 Commits 2 Branches 385 Tags
1b61cd1597068dbba2ef1ac6018339cf91c19b70
Commit Graph

32546 Commits

Author SHA1 Message Date
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
jakoblover
cae7e5e38d CPack/WIX: Add CPACK_WIX_ARCHITECTURE to support Windows for ARM installers 2022-05-05 09:11:57 -04:00
Brad King
284a3d7ae5 Merge topic 'better_error_message_when_lang_not_enabled' 
627ef4c1d0 Provide guidance when trying to use non-enabled language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7213
 2022-05-05 09:07:01 -04:00
Kitware Robot
d80c426683 CMake Nightly Date Stamp 2022-05-05 00:01:06 -04:00
Kasper Laudrup
a283e58b51 ExternalProject: Add DOWNLOAD_EXTRACT_TIMESTAMP option and policy 
Add the option to keep the current filestamps when extracting an
archive in ExternalProject_Add.

Enabling this option makes the behavior consistent with how
ExternalProject_Add is used when checking out code from revision
control instead of an archive.

Fixes: #22746
 2022-05-05 09:01:54 +10:00
Craig Scott
c150f89f4d CPack: Remove the deprecated PackageMaker generator 
This CPack generator has been deprecated since commit 7bf187499f
(CPack: Deprecate PackageMaker generator, 2020-01-31).

Fixes: #23344
 2022-05-05 08:36:44 +10:00
Brad King
16e0ccd70f Merge topic 'cuda-vs-use-LinkLineDeviceComputer' 
149c952007 CUDA: Use cmLinkLineDeviceComputer in VS generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7235
 2022-05-04 11:13:24 -04:00
Robert Maynard
627ef4c1d0 Provide guidance when trying to use non-enabled language 
Fixes #23463
 2022-05-04 09:33:35 -04:00
Kitware Robot
3d1d7d2b38 CMake Nightly Date Stamp 2022-05-04 00:01:09 -04:00
Robert Maynard
149c952007 CUDA: Use cmLinkLineDeviceComputer in VS generator 
Resolve a fixme comment in `ComputeCudaLinkOptions`.
 2022-05-03 12:37:59 -04:00
Brad King
e0dbca93aa Merge topic 'find_item-query-windows-registry' 
8d7e80cf3d find_* commands: add control over Windows registry views
08941a9a40 cmWindowsRegistry: Add helper for conversion between string and enum View
769f25aa3c cmWindowsRegistry: enhance unicode conversions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7211
 2022-05-03 11:31:04 -04:00
Brad King
29062b23cf Merge topic 'avoid-remove-empty-path' 
71ded12a75 cmGeneratedFileStream: Do not remove empty path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7223
 2022-05-03 11:25:09 -04:00
Brad King
28957f7f25 Merge topic 'avoid-remove-empty-path' into release-3.23 
71ded12a75 cmGeneratedFileStream: Do not remove empty path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7223
 2022-05-03 11:25:08 -04:00
Brad King
e253e57fe3 Merge topic 'restore-CPACK_PACKAGEMAKER_CHOICES' 
d099136add productbuild: Restore CPACK_PACKAGEMAKER_CHOICES variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7220
 2022-05-03 11:24:11 -04:00
Brad King
386496a544 Merge topic 'cpp-modules-prep' 
c5b56b35c2 cmInstallExportGenerator: expose the temporary directory
c107760417 cmNinjaTargetGenerator: support msvc-style deps discovery for scanning
64c15ec018 cmNinjaTargetGenerator: add flags for scanning based on the fileset type
aaa18f15cf cmTarget: add support for querying all file set names
cc4e19710d cmGlobalNinjaGenerator: use an extention based on the modmapfmt
97a68198c9 cmGlobalNinjaGenerator: escape `:` in module names
499009b79c cmTarget: avoid creating export entries if they don't exist
0513a1fe10 cmInstallGenerator: use CMake-private variables in generated code
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7214
 2022-05-03 11:20:26 -04:00
Craig Scott
29e31e2825 Packages: Integrate FetchContent and find_package() 
Allow FetchContent_MakeAvailable() to try a call to
find_package() first, or redirect a find_package() call to
FetchContent_MakeAvailable(). The user can set variables
to control which of these are allowed or tried by default.

Fixes: #21687
 2022-05-03 16:48:11 +10:00
Kitware Robot
ef10e61b6b CMake Nightly Date Stamp 2022-05-03 00:01:05 -04:00