CMake merge requestshttps://gitlab.kitware.com/cmake/cmake/-/merge_requests2020-12-17T08:47:33-05:00https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5619cmake-gui: Restore completion during path editing2020-12-17T08:47:33-05:00Brad Kingcmake-gui: Restore completion during path editingRevert commit 0fc181883127f77401ac4b6686c7016ee7752876 from !4894. `QFileSystemModel` is not a drop-in replacement for `QDirModel`. Additional changes are needed to make it work fully. Revert the change and suppress the `QDirModel` de...Revert commit 0fc181883127f77401ac4b6686c7016ee7752876 from !4894. `QFileSystemModel` is not a drop-in replacement for `QDirModel`. Additional changes are needed to make it work fully. Revert the change and suppress the `QDirModel` deprecation warning pending further investigation.
Fixes: #21589
Backport: release3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5615Utilities/Release: Update macOS Qt 5.9 build for platform versioning2020-12-21T19:41:39-05:00Brad KingUtilities/Release: Update macOS Qt 5.9 build for platform versioningBackport the upstream Qt [patch](https://code.qt.io/cgit/qt/qtbase.git/commit/?id=6387138a7991b4588639dc48847f175b5afaff84) to link Qt binaries using the `-isysroot` flag instead of `-Wl,-syslibroot`. This is needed so that the binaries...Backport the upstream Qt [patch](https://code.qt.io/cgit/qt/qtbase.git/commit/?id=6387138a7991b4588639dc48847f175b5afaff84) to link Qt binaries using the `-isysroot` flag instead of `-Wl,-syslibroot`. This is needed so that the binaries have a SDK version set, which is needed for runtime validation on modern macOS versions.
Follow up to !5595.
Backport: release3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5613CMakePackageConfigHelpers: relax restrictions on version range2022-05-11T13:58:41-04:00Marc ChevrierCMakePackageConfigHelpers: relax restrictions on version rangeBackport: release:HEAD^2Backport: release:HEAD^23.19.2Craig ScottCraig Scotthttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5604llvm-rc: Add CMAKE_VFS_OVERLAY to the preprocessing flags2020-12-15T07:38:24-05:00Thomas Bernardllvm-rc: Add CMAKE_VFS_OVERLAY to the preprocessing flagsThis change addresses an issue in the CMAKE_VFS_OVERLAY handling picked up by WangBin:
https://gitlab.kitware.com/cmake/cmake/-/issues/20658#note_871290
Backport: releaseThis change addresses an issue in the CMAKE_VFS_OVERLAY handling picked up by WangBin:
https://gitlab.kitware.com/cmake/cmake/-/issues/20658#note_871290
Backport: release3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5603cmake: Clear INSTALL file properties between runs2020-12-14T07:10:01-05:00Brad Kingcmake: Clear INSTALL file properties between runsDo not keep state across separate project configurations.
This is particularly important in `cmake-gui` where those
configurations can be for separate projects.
Fixes: #21580
Backport: releaseDo not keep state across separate project configurations.
This is particularly important in `cmake-gui` where those
configurations can be for separate projects.
Fixes: #21580
Backport: release3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5602macOS: Add /opt/homebrew to CMAKE_SYSTEM_PREFIX_PATH2021-03-11T09:05:47-05:00Brad KingmacOS: Add /opt/homebrew to CMAKE_SYSTEM_PREFIX_PATHAccording to https://brew.sh/2020/12/01/homebrew-2.6.0/ the `/opt/homebrew`
directory is recommended for installing ARM architecture brew packages.
Fixes: #21585
Backport: releaseAccording to https://brew.sh/2020/12/01/homebrew-2.6.0/ the `/opt/homebrew`
directory is recommended for installing ARM architecture brew packages.
Fixes: #21585
Backport: release3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5601FindGLUT: Handle Mojave and Big Sur 'tbd' framework files2020-12-14T07:11:11-05:00Robert MaynardFindGLUT: Handle Mojave and Big Sur 'tbd' framework filesBackport: release
Fixes: #20184
Topic-rename: FindGLUT-macos-tbdBackport: release
Fixes: #20184
Topic-rename: FindGLUT-macos-tbd3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5598Help: Fix/clarify docs mostly for changes or features added in CMake 3.192020-12-11T13:04:41-05:00Craig ScottHelp: Fix/clarify docs mostly for changes or features added in CMake 3.19The first commit isn't for a 3.19 feature, but it was found to be missing when moving the index entry for the `CMAKE_MINIMUM_REQUIRED_VERSION` variable.
Fixes: #21586
Backport: release:HEAD~1The first commit isn't for a 3.19 feature, but it was found to be missing when moving the index entry for the `CMAKE_MINIMUM_REQUIRED_VERSION` variable.
Fixes: #21586
Backport: release:HEAD~13.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5597ISPC: Suffix for Generated Headers configurable plus a better default2020-12-15T07:40:40-05:00Robert MaynardISPC: Suffix for Generated Headers configurable plus a better defaultThe target property `ISPC_HEADER_SUFFIX` and associated global
variable now can control the suffix used when generating the
C/C++ interoperability ISPC headers.
In addition the default suffix is now "_ispc.h" which matches the
common co...The target property `ISPC_HEADER_SUFFIX` and associated global
variable now can control the suffix used when generating the
C/C++ interoperability ISPC headers.
In addition the default suffix is now "_ispc.h" which matches the
common convention that the ISPC compiler team uses and recommends.
Backport: release3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5595ci: update macOS package to produce universal binaries2020-12-14T12:35:24-05:00Brad Kingci: update macOS package to produce universal binariesUpdate our deployment target to macOS 10.10.
This is required by Qt 5.9.
Fixes: #21565
Issue: #20825
Backport: releaseUpdate our deployment target to macOS 10.10.
This is required by Qt 5.9.
Fixes: #21565
Issue: #20825
Backport: release3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5593ci: Hard-code XCTest deployment target to 10.152020-12-10T06:57:57-05:00Brad Kingci: Hard-code XCTest deployment target to 10.15Avoid using the macOS version running on the CI job host that happens to run the build job.
Backport: releaseAvoid using the macOS version running on the CI job host that happens to run the build job.
Backport: release3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5591ISPC: Treat system includes as '-I' includes2020-12-10T06:57:09-05:00Robert MaynardISPC: Treat system includes as '-I' includesISPC doesn't have specific syntax for system includes.
Backport: release
Topic-rename: ispc-system-includesISPC doesn't have specific syntax for system includes.
Backport: release
Topic-rename: ispc-system-includes3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5589macOS: Offer control over host architecture on Apple Silicon hosts2023-03-14T16:49:14-04:00Brad KingmacOS: Offer control over host architecture on Apple Silicon hostsSince !5291 we use `sysctl` to detect
that we are running on Apple Silicon in a way that pierces Rosetta.
This always sets `CMAKE_HOST_SYSTEM_PROCESSOR` to be `arm64` on such
hosts. However, macOS offers strong support for running proce...Since !5291 we use `sysctl` to detect
that we are running on Apple Silicon in a way that pierces Rosetta.
This always sets `CMAKE_HOST_SYSTEM_PROCESSOR` to be `arm64` on such
hosts. However, macOS offers strong support for running processes under
an emulated `x86_64` architecture.
Teach CMake to select either `arm64` or `x86_64` as the host
architecture on Apple Silicon based on the architecture of its own
process. When CMake is built as a universal binary, macOS will select
whichever slice (architecture) is appropriate under the user's shell,
and `CMAKE_HOST_SYSTEM_PROCESSOR` will match.
Also offer a `CMAKE_APPLE_SILICON_PROCESSOR` variable and environment
variable to provide users with explicit control over the host
architecture selection regardless of CMake's own architecture.
Finally, if `CMAKE_OSX_ARCHITECTURES` is not set, pass explicit flags to
the toolchain to use selected host architecture instead of letting the
toolchain pick.
Fixes: #21554
Backport: release3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5588execute_process: Improve COMMAND_ERROR_IS_FATAL error capture scenarios2021-08-18T15:46:14-04:00Asit Dhaldhal.asitk@gmail.comexecute_process: Improve COMMAND_ERROR_IS_FATAL error capture scenarios1. COMMAND_ERROR_IS_FATAL ANY will capture errors if the exit code is
non zero, there is a timeout or an abnormal exit.
2. COMMAND_ERROR_IS_FATAL LAST
will capture if only the last process has an exit code non zero, there
is a timeout o...1. COMMAND_ERROR_IS_FATAL ANY will capture errors if the exit code is
non zero, there is a timeout or an abnormal exit.
2. COMMAND_ERROR_IS_FATAL LAST
will capture if only the last process has an exit code non zero, there
is a timeout or an abnormal exit.
Fixes: #21562
Backport: release
Topic-rename: execute_process-command-error3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5583Intel: Remove partial Clang and DPC++ compiler support2020-12-10T09:27:43-05:00Brad KingIntel: Remove partial Clang and DPC++ compiler supportRevert !5255 and !5300. The compilers have already been released, and are more usable with CMake by pretending to be upstream Clang than by identifying it as a compiler for which we have not implemented support.
This can be restored la...Revert !5255 and !5300. The compilers have already been released, and are more usable with CMake by pretending to be upstream Clang than by identifying it as a compiler for which we have not implemented support.
This can be restored later in combination with more complete support for the compilers.
Fixes: #21551
Issue: #21560, #21561
Backport: release3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5582Document CMP0112 covers $<TARGET_FILE_NAME,tgt>2020-12-08T10:20:16-05:00Robert MaynardDocument CMP0112 covers $<TARGET_FILE_NAME,tgt>Fixes: #21559
Backport: releaseFixes: #21559
Backport: release3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5581ISPC: Fix path computation2020-12-08T10:17:38-05:00Robert MaynardISPC: Fix path computationFixes ISPC issue reported directly to me
Backport: releaseFixes ISPC issue reported directly to me
Backport: release3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5572macOS: Add architecture flags only for native ASM dialect2020-12-07T10:28:24-05:00Raul Tambreraul@tambre.eemacOS: Add architecture flags only for native ASM dialectASM dialects like NASM have languages names such as ASM_NASM.
However such ASM dialects don't support the architecture flags, so match only
the full name.
Fixes #21553.
Backport: releaseASM dialects like NASM have languages names such as ASM_NASM.
However such ASM dialects don't support the architecture flags, so match only
the full name.
Fixes #21553.
Backport: release3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5570CMakeDetermineCompilerId: Tolerate stray text around INFO strings2020-12-04T08:27:07-05:00Brad KingCMakeDetermineCompilerId: Tolerate stray text around INFO stringsWhen cross-compiling with Xcode our compiler id test binary may be
compiled with multiple architectures. The INFO strings should be
identical and therefore de-duplicated. However, this can be broken by
stray text that happens to sit im...When cross-compiling with Xcode our compiler id test binary may be
compiled with multiple architectures. The INFO strings should be
identical and therefore de-duplicated. However, this can be broken by
stray text that happens to sit immediately before or after an INFO
string. Filter out such text so we can match clean INFO strings.
Fixes: #21526
Backport: release3.19.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5569Tests: Look for Visual Studio only on Windows hosts2020-12-04T08:25:50-05:00Brad KingTests: Look for Visual Studio only on Windows hostsUpdate logic added by !4898 to only look for VS installations using `cmake_host_system_information` on Windows hosts. Otherwise the `VS_*_DIR` keys are not available.
Fixes: #21547
Backport: releaseUpdate logic added by !4898 to only look for VS installations using `cmake_host_system_information` on Windows hosts. Otherwise the `VS_*_DIR` keys are not available.
Fixes: #21547
Backport: release3.19.2Brad KingBrad King