mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 14:19:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
53,810 Commits 2 Branches 401 Tags
b6cf93472fe25d6c91d893cd1d243dc2d0e160bb
Commit Graph

53810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Maynard f5dbc27c27 NVHPC-CXX: Add support for C++20 2021-08-05 16:19:12 -04:00
Đoàn Trần Công Danh 93eb4a7bd1 Ninja: Revert accidental LINK_WHAT_YOU_USE impl for static libraries 
In commit d7159f9591, (Ninja: Fix LINK_WHAT_YOU_USE link flag placement,
2021-06-24), we fixed usage of -Wl,--no-as-needed to override
-Wl,--as-needed from LDFLAGS. However, that change also passes
-Wl,--no-as-needed to `ar`, which is incorrect flag for `ar`.

Let's check the target type before passing down the flags.

Fixes: #22487
 2021-08-03 11:21:26 -04:00
Brad King fbf5a368c9 Merge topic 'cpack-rpm-pre-semicolon' into release-3.21 
3cdf23985f CPackRPM: avoid a spurious `;` in the `%pre` and other sections with scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6415
 2021-08-03 11:01:08 -04:00
Brad King 54be23df7f Merge topic 'CC-DEPFILE-independent-from-CMAKE_DEPENDS_USE_COMPILER' into release-3.21 
213fec4908 add_custom_command(DEPFILE) independent from CMAKE_DEPENDS_USE_COMPILER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6421
 2021-08-03 10:59:38 -04:00
Brad King aa1426da4a Merge topic 'help-get_filename_path-fix-version-changed' into release-3.21 
8b28fe5670 Help: get_filename_component: fix version info for cmake_path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6423
 2021-08-03 10:57:44 -04:00
Brad King 91ba893536 Merge branch 'macos-10.4' into release-3.20 
Merge-request: !6426
 2021-08-02 16:14:39 -04:00
Evan Miller 1af23c4de2 macOS: Restore support for Mac OS X 10.4 (Tiger) 
Since commit 4aed96e230 (Apple: Set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG
on non-macOS too, 2021-04-06, v3.20.1~5^2) we always enable support for
linking with `-rpath`.  The intention of the change was to enable using
the flag on iOS, tvOS and watchOS by avoiding a Darwin-specific version
check.  However, removing the check broke support for OS X 10.4 because
the flag is not supported on that version.

Restore a form of the check that disables the flag on OS X < 10.5 while
still allowing it for the other Apple platforms.  Since no one is doing
iOS/tvOS/etc development on 10.4, this change should have no unintended
side effects.

Fixes: #22490
 2021-08-02 16:12:14 -04:00
Artur Samarin 3cdf23985f CPackRPM: avoid a spurious ; in the %pre and other sections with scripts 
This was accidentally added by commit 34c8a23044 (CPackRPM: add
scriplets tags only if scripts exist, 2021-04-01, v3.21.0-rc1~387^2).

Fixes: #22501
 2021-08-02 15:04:22 -04:00
Brad King e9b8d6fdbc Merge topic 'vs-iface-include-dirs' into release-3.21 
53aabe9817 VS: Fix assertion failure on INCLUDE_DIRECTORIES in INTERFACE libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6411
 2021-08-02 14:07:13 -04:00
Brad King d14a1ae859 Merge topic 'nvhpc-MD-flag' into release-3.21 
7ce718376c NVHPC: Support 21.07 change to '-MD' where it behaves like gcc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6408
 2021-08-02 14:05:34 -04:00
Brad King 00535bab00 Merge topic 'autogen-ui-header-depends' into release-3.21 
283e8d8d04 AUTOUIC: Add test for cyclic dependency between UI headers and timestamp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !6404
 2021-08-02 14:04:08 -04:00
Marc Chevrier 8b28fe5670 Help: get_filename_component: fix version info for cmake_path 
Fixes: #22505
 2021-08-02 11:12:46 +02:00
Craig Scott 28ce8a932d Merge topic 'doc-dmg-filesystem' into release-3.21 
03ddaf1763 Help: Add missing versionadded annotation for CPACK_DMG_FILESYSTEM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6416
 2021-08-02 04:56:23 -04:00
Craig Scott 6fb63e56df Merge topic 'doc-presets-toolchain-file' into release-3.21 
ca371d3a14 Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6417
 2021-08-02 04:54:49 -04:00
Marc Chevrier 213fec4908 add_custom_command(DEPFILE) independent from CMAKE_DEPENDS_USE_COMPILER 
Fixes: #22486
 2021-08-01 15:24:16 +02:00
Craig Scott ca371d3a14 Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILE 2021-07-31 17:08:42 +10:00
Craig Scott 03ddaf1763 Help: Add missing versionadded annotation for CPACK_DMG_FILESYSTEM 2021-07-31 11:14:26 +10:00