CMake merge requestshttps://gitlab.kitware.com/cmake/cmake/-/merge_requests2021-08-25T10:00:55-04:00https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6480VS: Update Visual Studio 17 2022 generator for Preview 3.12021-08-25T10:00:55-04:00Brad KingVS: Update Visual Studio 17 2022 generator for Preview 3.1Issue: #22339
Backport: releaseIssue: #22339
Backport: release3.21.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6469VS: Add special case for '-T version=14.29.16.11' under VS 16.112021-08-24T09:58:13-04:00Brad KingVS: Add special case for '-T version=14.29.16.11' under VS 16.11Extend the table of special cases from !5903 and updated by
!6169. 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
Backport: releaseExtend the table of special cases from !5903 and updated by
!6169. 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
Backport: release3.21.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6467FindMPI: do not detect `-framework` as a compile flag2021-08-30T14:24:17-04:00Ben BoeckelFindMPI: do not detect `-framework` as a compile flagMPICH 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 f...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
---
Cc: @chuck.atkins
Backport: release3.21.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6465AUTOUIC: Revert "Fix generating of dependency rules for UI header files"2021-08-24T09:57:14-04:00Brad KingAUTOUIC: Revert "Fix generating of dependency rules for UI header files"Revert !6380 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
Backport: releaseRevert !6380 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
Backport: release3.21.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6462CheckLanguage: Avoid CMP0126 warning2021-08-19T10:25:19-04:00Brad KingCheckLanguage: Avoid CMP0126 warningThe 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 doe...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
Backport: release3.21.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6461FindPkgConfig: Restore legacy behavior when CMP0126 is set to NEW2021-08-19T10:27:28-04:00Brad KingFindPkgConfig: Restore legacy behavior when CMP0126 is set to NEWModule behavior must be independent from `CMP0126` policy.
Fixes: #22526
Co-authored-by: @marc.chevrier
Backport: releaseModule behavior must be independent from `CMP0126` policy.
Fixes: #22526
Co-authored-by: @marc.chevrier
Backport: release3.21.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6457FindBinUtils: Fall back to ld for Clang without lld2021-08-19T11:33:01-04:00Thomas BernardFindBinUtils: Fall back to ld for Clang without lldFixes: #22500
Backport: release
Topic-rename: binutils-clang-fallback-ldFixes: #22500
Backport: release
Topic-rename: binutils-clang-fallback-ld3.21.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6449Android: Fix NDK toolchain dir on arm64 mac2021-08-19T10:23:35-04:00WangBinAndroid: Fix NDK toolchain dir on arm64 macndk 23 + cmake 21 reports darwin-x86 is the toolchain dir
Backport: release
Topic-rename: android-macos-arm64ndk 23 + cmake 21 reports darwin-x86 is the toolchain dir
Backport: release
Topic-rename: android-macos-arm643.21.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6445VS: Fix /reference and /headerUnit flag table entries for v142 and v1432021-08-11T09:17:12-04:00Brad KingVS: Fix /reference and /headerUnit flag table entries for v142 and v143These flags accept values in following arguments, not immediately
appended.
Fixes: #22530
Backport: releaseThese flags accept values in following arguments, not immediately
appended.
Fixes: #22530
Backport: release3.21.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6434BinUtils: Avoid searching CMAKE_PREFIX_PATH2021-08-10T09:22:59-04:00Cristian AdamBinUtils: Avoid searching CMAKE_PREFIX_PATHOur `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 b...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
Backport: release
Topic-rename: binutils-no-cmake-paths3.21.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6431Help: cmake_path: add missing parameter2021-08-09T09:38:02-04:00scivisionHelp: cmake_path: add missing parameterfor cmake_path(`CONVERT` ... [NORMALIZE]) was missing in top summary.
Backport: releasefor cmake_path(`CONVERT` ... [NORMALIZE]) was missing in top summary.
Backport: release3.21.2Marc ChevrierMarc Chevrierhttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6430NVHPC: support new c and c++ standards2021-08-09T09:37:07-04:00Robert MaynardNVHPC: support new c and c++ standardsBackport: releaseBackport: release3.21.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6426macOS: Restore support for Mac OS X 10.4 (Tiger)2021-09-23T10:24:27-04:00Evan MillermacOS: Restore support for Mac OS X 10.4 (Tiger)Since !5980 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 fo...Since !5980 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
Backport: release
Topic-rename: macos-10.43.21.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6423Help: get_filename_component: fix version info for cmake_path2021-08-03T10:57:49-04:00Marc ChevrierHelp: get_filename_component: fix version info for cmake_pathFixes: #22505
Backport: releaseFixes: #22505
Backport: release3.21.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6421add_custom_command(DEPFILE) independent from CMAKE_DEPENDS_USE_COMPILER2021-08-03T10:59:42-04:00Marc Chevrieradd_custom_command(DEPFILE) independent from CMAKE_DEPENDS_USE_COMPILERFixes: #22486
Backport: release:HEAD^2Fixes: #22486
Backport: release:HEAD^23.21.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6418Ninja: Revert accidental LINK_WHAT_YOU_USE impl for static libraries2021-08-07T08:08:07-04:00Đoàn Trần Công DanhNinja: Revert accidental LINK_WHAT_YOU_USE impl for static librariesIn !6263, 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 d...In !6263, 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
Backport: release:HEAD^23.21.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6417Help: Fix unlinked mention of CMAKE_TOOLCHAIN_FILE2021-08-02T04:54:55-04:00Craig ScottHelp: Fix unlinked mention of CMAKE_TOOLCHAIN_FILEBackport: releaseBackport: release3.21.2Craig ScottCraig Scotthttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6416Help: Add missing versionadded annotation for CPACK_DMG_FILESYSTEM2021-08-02T04:56:27-04:00Craig ScottHelp: Add missing versionadded annotation for CPACK_DMG_FILESYSTEMBackport: releaseBackport: release3.21.2Craig ScottCraig Scotthttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6415CPackRPM: avoid a spurious `;` in the `%pre` section2021-08-03T11:01:12-04:00Artur SamarinCPackRPM: avoid a spurious `;` in the `%pre` sectionFixes: #22501
Backport: release
Topic-rename: cpack-rpm-pre-semicolonFixes: #22501
Backport: release
Topic-rename: cpack-rpm-pre-semicolon3.21.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/6411VS: Fix assertion failure on INCLUDE_DIRECTORIES in INTERFACE libraries2021-08-02T14:07:18-04:00Brad KingVS: Fix assertion failure on INCLUDE_DIRECTORIES in INTERFACE librariesSince !5078, the
VS generator may process INTERFACE libraries. Avoid code paths in the
generator that process include directories because they should not be
used by INTERFACE libraries since they do not compile anything.
Fixes: #22494 ...Since !5078, the
VS generator may process INTERFACE libraries. Avoid code paths in the
generator that process include directories because they should not be
used by INTERFACE libraries since they do not compile anything.
Fixes: #22494
Backport: release3.21.2Brad KingBrad King