mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-26 10:48:38 -06:00
Code Issues Packages Projects Releases Wiki Activity
53,827 Commits 2 Branches 391 Tags
b125e9809a1a3f3e28fc1682c8a33c3a928f79b5
Commit Graph

53827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
b125e9809a HIP: Detect ROCm path earlier 
Fail early if it is not found.

Use the detected location as a hint to find `rocm_agent_enumerator`.

Also remove the leading `_` prefix in case we want to document this
publicly later.
 2021-09-16 14:45:07 -04:00
Zack Galbreath
735f41fc2d HIP: Use 'rocm_agent_enumerator' to determine CMAKE_HIP_ARCHITECTURES 2021-09-16 14:41:30 -04:00
Brad King
64aac043ee Merge topic 'vs2022' into release-3.21 
b6ac10394b VS: Update Visual Studio 17 2022 generator for Preview 4
f200f4d5a7 VS: Fix managed C++ project generation for VS 2022

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6524
 2021-09-16 08:16:53 -04:00
Brad King
b6ac10394b VS: Update Visual Studio 17 2022 generator for Preview 4 2021-09-15 13:20:02 -04:00
Brad King
f200f4d5a7 VS: Fix managed C++ project generation for VS 2022 
VS 2022 expects managed `.vcxproj` files to have a `ManagedAssembly`
element.

Fixes: #22583
 2021-09-15 13:19:37 -04:00
Brad King
d2a5fef985 Merge topic 'update-kwsys' into release-3.21 
115152ce10 KWSys: SystemTools: Ensure Windows Vista APIs are available before using them

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6500
 2021-09-09 13:19:53 -04:00
Brad King
0e097776fa Merge topic 'ci-msvc-19.29-16.11' into release-3.21 
09c7c0a9c3 gitlab-ci: Update Windows builds to MSVC 19.29-16.11 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6501
 2021-09-09 13:17:31 -04:00
Marc Chevrier
45e4ba11cd Merge topic 'FindPyhton-homebew-on-Mac-M1' into release-3.21 
2636ad5045 FindPython: Ensure homebrew on Mac M1 is used

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6499
 2021-09-07 05:18:54 -04:00
Brad King
31a5b256b9 Merge topic 'vs2022' into release-3.21 
38c8f2c4e3 IRSL: Add discovery of VS 2022 v143 toolset redistributables
f01ea7e391 MSVC: Fix MSVC_TOOLSET_VERSION for VS 2022 v143 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6497
 2021-09-03 10:18:49 -04:00
Brad King
db053dfd23 Merge topic 'FindBoost-1.77' into release-3.21 
1ad0c5ae53 FindBoost: Add support for Boost 1.77

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6494
 2021-09-03 10:17:34 -04:00
Brad King
351b5ddbf3 Merge topic 'ninja-armclang-windows' into release-3.21 
b6cf93472f Ninja: fix ARMClang paths for Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6484
 2021-09-03 10:16:25 -04:00
ulatekh
115152ce10 KWSys: SystemTools: Ensure Windows Vista APIs are available before using them 
Backport KWSys commit `4ef5b1063` (SystemTools: Ensure Windows Vista
APIs are available before using them, 2021-08-30) to the CMake 3.21
release branch.
 2021-09-03 10:04:38 -04:00
Marc Chevrier
2636ad5045 FindPython: Ensure homebrew on Mac M1 is used 
Fixes: #22581
 2021-09-03 14:59:52 +02:00
Brad King
09c7c0a9c3 gitlab-ci: Update Windows builds to MSVC 19.29-16.11 toolset 2021-09-02 14:24:25 -04:00
Brad King
38c8f2c4e3 IRSL: Add discovery of VS 2022 v143 toolset redistributables 
Fixes: #22586
 2021-09-02 13:47:46 -04:00
Brad King
f01ea7e391 MSVC: Fix MSVC_TOOLSET_VERSION for VS 2022 v143 toolset 
This was forgotten in commit 0c7f918fb1 (VS: Update Visual Studio 17
2022 generator for Preview 2, 2021-07-14, v3.21.1~29^2) when the toolset
was first renumbered to `v143`.

Fixes: #22585
 2021-09-02 13:47:42 -04:00
Brad King
1ad0c5ae53 FindBoost: Add support for Boost 1.77 
Update the list of known versions.

Run the command

    cmake -DBOOST_DIR=/path/to/boost_1_77_0 \
      -P Utilities/Scripts/BoostScanDeps.cmake

to extract dependencies from the 1.77.0 source tree.  The dependencies
differ from those of 1.76: the `contract`, `thread`, and `wave`
components no longer depend on `date_time`.  The `math` component no
longer depends on `atomic`.

Fixes: #22588
 2021-09-02 12:43:43 -04:00
Martin Kojtal
b6cf93472f Ninja: fix ARMClang paths for Windows 
We need to escape paths for ARMClang on Windows, see the referenced
issue for more details.

Fixes: #21093
 2021-09-02 11:40:17 -04:00
Brad King
31c5700d43 CMake 3.21.2 v3.21.2 2021-08-25 10:17:05 -04:00
Brad King
af71bdb601 Merge topic 'vs2022' into release-3.21 
c8ec137da7 VS: Update Visual Studio 17 2022 generator for Preview 3.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6480
 2021-08-25 09:59:46 -04:00
Brad King
c8ec137da7 VS: Update Visual Studio 17 2022 generator for Preview 3.1 
Issue: #22339
 2021-08-25 09:47:30 -04:00
Brad King
e4302d8c8d Merge branch 'release-3.20' into release-3.21 2021-08-25 09:14:15 -04:00
Brad King
eae5533ab3 Merge topic 'GNUInstallDirs-variable-named-0' into release-3.21 
49a5dbcaff GNUInstallDirs: avoid unwanted variable dereference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6474
 2021-08-25 09:12:22 -04:00
Brad King
fd64b84d15 Merge branch 'GNUInstallDirs-variable-named-0' into release-3.20 
Merge-request: !6474
 2021-08-24 10:02:58 -04:00
Brad King
5a4847a0a4 Merge topic 'vs-toolset-version' into release-3.21 
25c5ebba7e VS: Add special case for '-T version=14.29.16.11' under VS 16.11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6469
 2021-08-24 09:58:08 -04:00
Brad King
b2e2f5c196 Merge topic 'revert-autouic-header-depends' into release-3.21 
d2a6e160aa AUTOUIC: Revert "Fix generating of dependency rules for UI header files"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6465
 2021-08-24 09:57:08 -04:00
Brad King
1dd9c96427 Merge topic 'FindMPI-framework-not-a-compile-flag' into release-3.21 
2b2a6a7170 FindMPI: do not detect `-framework` as a compile flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !6467
 2021-08-24 09:54:57 -04:00
Ben Boeckel
49a5dbcaff GNUInstallDirs: avoid unwanted variable dereference 
In some situations, it seems that the variable `0` is defined. In the
case found, it was set to `1`. This makes the detection of the missing
third argument bogus and unnecessarily triggers a warning.

This oversight was introduced in 229b5ee994 (GNUInstallDirs: Add dir
argument to GNUInstallDirs_get_absolute_install_dir, 2020-10-31) prior
to CMake 3.20's release cycle.
 2021-08-22 12:42:48 -04:00
Brad King
25c5ebba7e VS: Add special case for '-T version=14.29.16.11' under VS 16.11 
Extend the table of special cases from commit 58a50a3a0a (VS: Fix '-T
version=14.28' under VS 16.9, 2021-03-11, v3.19.7~1^2~1) and updated by
commit a60141feaa (VS: Add special case for '-T version=14.29.16.10'
under VS 16.10, 2021-05-27, v3.20.4~11^2).  Add a special case for the
name VS 17 will use for VS 16.11's default toolset, so that it can be
used with VS 16.11 too.

Issue: #21922
 2021-08-19 14:57:30 -04:00
Ben Boeckel
2b2a6a7170 FindMPI: do not detect -framework as a compile flag 
MPICH 3.4.2 now reports `-framework OpenCL` as one of its compilation
flag. The compile flag extraction is seeing it as a generic `-f` flag
and misses its argument. This ends up with a compile option of
`-framework` which eats the next flag (and may be very important).

It does not seem that passing `-framework` as a link flag is necessary
at this time, so that is being actively ignored for now.

Fixes: #22555
 2021-08-19 13:09:39 -04:00
Brad King
d2a6e160aa AUTOUIC: Revert "Fix generating of dependency rules for UI header files" 
Revert commit e5ec0e52f4 (AUTOUIC: Fix generating of dependency rules
for UI header files, 2021-07-22, v3.21.1~8^2) because it caused
regressions.  For example, changing one C++ source can now cause many
others to rebuild.  Revert the change pending further investigation.

Fixes: #22531
Issue: #16776
 2021-08-19 12:23:16 -04:00
Brad King
30dd9b33a0 Merge topic 'FindPkgConfig-restore-legacy-behavior' into release-3.21 
17e4934dbf FindPkgConfig: Restore legacy behavior when CMP0126 is set to NEW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6461
 2021-08-19 10:27:23 -04:00
Brad King
daeb4f0f50 Merge topic 'binutils-clang-fallback-ld' into release-3.21 
788b7afff2 FindBinUtils: Fall back to ld for Clang without lld

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6457
 2021-08-19 10:26:17 -04:00
Brad King
a7daf30070 Merge topic 'CheckLanguage-CMP0126' into release-3.21 
89ed11ae6f CheckLanguage: Avoid CMP0126 warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6462
 2021-08-19 10:25:15 -04:00
Brad King
7f6905630f Merge topic 'android-macos-arm64' into release-3.21 
164643fc39 Android: Fix NDK toolchain dir on arm64 mac

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6449
 2021-08-19 10:23:31 -04:00
Brad King
89ed11ae6f CheckLanguage: Avoid CMP0126 warning 
The macro's implementation converts a normal variable into a cache
variable intentionally, so both are set.  Explicitly set CMP0126 to NEW
to avoid a warning in trace mode.  This won't affect the module behavior
because the code path does not activate if a normal variable is already
defined anyway.

Fixes: #22548
 2021-08-18 15:25:49 -04:00
Marc Chevrier
17e4934dbf FindPkgConfig: Restore legacy behavior when CMP0126 is set to NEW 
Module behavior must be independent from `CMP0126` policy.

Fixes: #22526
 2021-08-18 14:51:50 -04:00
Thomas Bernard
788b7afff2 FindBinUtils: Fall back to ld for Clang without lld 
If `lld` is not available, Clang can still use `ld`.

Fixes: #22500
 2021-08-18 14:31:21 -04:00
WangBin
164643fc39 Android: Fix NDK toolchain dir on arm64 mac 2021-08-18 14:09:33 -04:00
Brad King
3de5096094 Merge topic 'vs-flags' into release-3.21 
3f9ef3703a VS: Fix /reference and /headerUnit flag table entries for v142 and v143

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6445
 2021-08-11 09:14:25 -04:00
Brad King
3f9ef3703a VS: Fix /reference and /headerUnit flag table entries for v142 and v143 
These flags accept values in following arguments, not immediately
appended.

Fixes: #22530
 2021-08-10 10:37:57 -04:00
Brad King
81aef41569 Merge topic 'binutils-no-cmake-paths' into release-3.21 
fc1f733cc7 BinUtils: Avoid searching CMAKE_PREFIX_PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6434
 2021-08-10 09:22:52 -04:00
Cristian Adam
fc1f733cc7 BinUtils: Avoid searching CMAKE_PREFIX_PATH 
Our `find_program` calls specify `HINTS` to look in the toolchain's
directory first, and then in `PATH`.  `CMAKE_PREFIX_PATH` may be
specified by the user to help find packages for project dependencies,
but this should not override the binutils.

Fixes: #22512
 2021-08-09 09:59:29 -04:00
Brad King
c949772c44 Merge topic 'help_cmake_path' into release-3.21 
bb19af546b Help: cmake_path: add missing parameter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6431
 2021-08-09 09:37:58 -04:00
Brad King
b5c4b70290 Merge topic 'nvhpc_support_new_c_and_c++_standards' into release-3.21 
9ac426e460 NVHPC-C: Add support for C17
f5dbc27c27 NVHPC-CXX: Add support for C++20

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !6430
 2021-08-09 09:36:58 -04:00
Michael Hirsch
bb19af546b Help: cmake_path: add missing parameter 
for cmake_path(`CONVERT` ... [NORMALIZE]) was missing in top summary
 2021-08-06 11:55:53 -04:00
Brad King
86633cc203 Merge topic 'ninja-lwyu-ar' into release-3.21 
93eb4a7bd1 Ninja: Revert accidental LINK_WHAT_YOU_USE impl for static libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6418
 2021-08-06 10:55:48 -04:00
Brad King
f21ed57ecb Merge branch 'release-3.20' into release-3.21 2021-08-06 10:53:28 -04:00
Brad King
ea8fc62194 Merge topic 'macos-10.4' into release-3.21 
1af23c4de2 macOS: Restore support for Mac OS X 10.4 (Tiger)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6426
 2021-08-06 10:48:20 -04:00
Robert Maynard
9ac426e460 NVHPC-C: Add support for C17 2021-08-05 16:19:23 -04:00