mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 23:28:32 -05:00
Code Issues Packages Projects Releases Wiki Activity
57,526 Commits 2 Branches 401 Tags
5c021c835522d2471ff3c9ddb6dc525e0d826b0e
Commit Graph

9387 Commits

Author SHA1 Message Date
Brad King 918e98e131 Merge topic 'vs-system-include' 
7a2496daad VS: Add support for SYSTEM include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7238
 2022-05-20 09:12:57 -04:00
Brad King 88ed9355f5 Merge topic 'win_arm64_native_toolchain' 
af6928ce92 VS: ARM64 as default toolset architecture for ARM64 host

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7264
 2022-05-20 09:11:15 -04:00
Brad King 92c7c2c39a Merge topic 'findvulkan-improvements' 
7974fcd1a7 FindVulkan: remove noop on CMAKE_MODULE_PATH in tests
acdb5fe0e8 FindVulkan: Add component for `glslc` and `glslangValidator`
998ee49779 FindVulkan: ensure policy CMP0057 is NEW to use `IN_LIST` with `if()`
9f8720e74c FindVulkan: Add component for `glslang`
8d133f49e3 FindVulkan: Add component for `SPIRV-Tools`
6e4d20921d FindVulkan: Add component for `shaderc_combined`
2f46b8d723 FindVulkan: Move `mark_as_advanced` right after `find_*` calls.
08a420af4a FindVulkan: Factorize code for library/executable search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7225
 2022-05-20 09:08:44 -04:00
Niyas Sait af6928ce92 VS: ARM64 as default toolset architecture for ARM64 host 
Visual Studio 2022 17 Preview introduced a native ARM64 toolchain.
 2022-05-19 09:57:54 -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
Josiah Bills 7a2496daad VS: Add support for SYSTEM include directories 
Fixes: #17904
 2022-05-18 18:52:00 -04:00
MACHIZAUD Andréa 7974fcd1a7 FindVulkan: remove noop on CMAKE_MODULE_PATH in tests 2022-05-18 23:16:11 +02:00
MACHIZAUD Andréa 9f8720e74c FindVulkan: Add component for glslang 2022-05-18 23:16:09 +02:00
MACHIZAUD Andréa 8d133f49e3 FindVulkan: Add component for SPIRV-Tools 2022-05-18 23:15:50 +02:00
MACHIZAUD Andréa 6e4d20921d FindVulkan: Add component for shaderc_combined 2022-05-18 23:15:48 +02: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 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
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 91987aec24 Tests: Add missing return types to C function prototypes 
These were diagnosed by a Clang 15 development version.
 2022-05-13 11:07:17 -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
Craig Scott a6c34b0353 project(): Add new CMAKE_PROJECT_TOP_LEVEL_INCLUDES file injection point 
Fixes: #22685
 2022-05-13 18:03:36 +10:00
Erin Melucci ba969ce5fe cmake-presets: add ${pathListSep} macro 
Fixes: #23282
 2022-05-12 10:37:49 -04:00
Brad King fdc9e9e4fa Merge topic 'vs-arm64-tests' 
834422e075 Tests: Fix test failures for Windows Arm64 platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7251
 2022-05-12 09:25:37 -04:00
Niyas Sait 834422e075 Tests: Fix test failures for Windows Arm64 platforms 2022-05-11 18:13:25 +01: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
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
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
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 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
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
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 2045e1eee0 Merge topic 'less_ptx_for_all_all-major_native' 
e8591f1516 CUDA: native/all/all-major generates minimal set of ptx code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7216
 2022-05-04 11:18:28 -04:00
Brad King bdaa4b8459 Merge topic 'chsi-windows_registry-updates' 
0c33f12a39 cmake_host_system_information(WINDOWS_REGISTRY) updates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7229
 2022-05-04 11:10:12 -04:00
Robert Maynard 627ef4c1d0 Provide guidance when trying to use non-enabled language 
Fixes #23463
 2022-05-04 09:33:35 -04:00
Robert Maynard e8591f1516 CUDA: native/all/all-major generates minimal set of ptx code 
Fixes #23459
 2022-05-03 11:52:23 -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 252fdfe6e4 Merge topic 'cuda-arch-verify' 
7bf5200699 CUDA: Restore CMAKE_CUDA_ARCHITECTURES support for -real and -virtual suffixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewd-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7218
 2022-05-03 11:26:40 -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
Marc Chevrier 0c33f12a39 cmake_host_system_information(WINDOWS_REGISTRY) updates 
* add a cross-reference in 'get_filename_component()' documentation
* rework tests for better 32bit systems support
 2022-05-01 12:57:24 +02:00
Marc Chevrier 8d7e80cf3d find_* commands: add control over Windows registry views 
Fixes: #22775
 2022-04-29 22:00:02 +02:00
Brad King 7bf5200699 CUDA: Restore CMAKE_CUDA_ARCHITECTURES support for -real and -virtual suffixes 
Fix the validation regex added by commit c267ed205a (CUDA: Defer
architecture testing to the compiler testing step, 2022-04-25) to
allow these values.
 2022-04-29 09:07:53 -04:00
Brad King d35f1c9bee Merge topic 'cuda-arch-verify' 
c267ed205a CUDA: Defer architecture testing to the compiler testing step

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7202
 2022-04-28 09:36:31 -04:00
Ben Boeckel c5b56b35c2 cmInstallExportGenerator: expose the temporary directory 
This needs to be known so that C++ module properties for the install can
be staged beside the other files.

Always perform the MD5 transformation (in non-bootstrap builds) so that
the path can be computed prior to generation (where it used the longest
configuration name to detect too-long paths). Update tests to expect the
always-present MD5 value. Note that this improves robustness of the test
suite as testing in a too-long path may have triggered the MD5
conversion anyways.
 2022-04-28 09:13:48 -04:00
Marc Chevrier b13eef5a90 cm::enum_set: container that contains a set of unique enum values. 
The enum must be an `enum class` with an unsigned integer as base type.
 2022-04-27 19:40:40 +02:00