summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmake-gui: Restore completion during path editingBrad King2020-12-151-9/+14
| | | | | | | | | | Revert commit 0fc1818831 (QCMakeWidgets: replace QDirModel, 2020-06-15, v3.19.0-rc1~696^2). `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
* Merge topic 'ispc_control_header_suffixes' into release-3.19Brad King2020-12-1526-15/+148
|\ | | | | | | | | | | | | c9a50f3556 ISPC: Generated Headers suffix configurable with a better default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5597
| * ISPC: Generated Headers suffix configurable with a better defaultRobert Maynard2020-12-1426-15/+148
| | | | | | | | | | | | | | | | | | 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.
* | Merge topic 'support_CMAKE_VFS_OVERLAY_for_rc_compilation' into release-3.19Brad King2020-12-151-4/+16
|\ \ | | | | | | | | | | | | | | | | | | 18ee6d7e32 llvm-rc: Add CMAKE_VFS_OVERLAY to the preprocessing flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5604
| * | llvm-rc: Add CMAKE_VFS_OVERLAY to the preprocessing flagsThomas Bernard2020-12-141-4/+16
| |/ | | | | | | Issue: #20658
* | Merge topic 'ninja-no-cleandead' into release-3.19Brad King2020-12-152-15/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | 1144d25094 Merge branch 'backport-ninja-no-cleandead' into ninja-no-cleandead 73a961eaba Ninja: Remove cleandead on regeneration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5614
| * \ Merge branch 'backport-ninja-no-cleandead' into ninja-no-cleandeadBrad King2020-12-142-15/+1
| |\ \ | | |/ | |/|
| | * Ninja: Remove cleandead on regenerationBrad King2020-12-142-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the `cleandead` tool invocation added by commit fb18215904 (Ninja: clean ninja metadata once generated, 2019-05-13, v3.17.0-rc1~207^2). The tool deletes files that were not previously deleted by regenerating the build system. Also, there are use cases where no-longer-generated files should not be removed, such as Qt's TS files. Fixes: #21549
* | | Merge topic 'rel-macos-apple-silicon' into release-3.19Brad King2020-12-153-1/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 23de430545 Utilities/Release: Update macOS Qt 5.9 build for platform versioning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5615
| * | | Utilities/Release: Update macOS Qt 5.9 build for platform versioningBrad King2020-12-143-1/+22
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Backport the upstream Qt patch [1] 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. [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=6387138a7991b4588639dc48847f175b5afaff84
* | | Merge topic 'CMakePackageConfigHelpers-version-range' into release-3.19Craig Scott2020-12-154-47/+160
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 7f44760991 CMakePackageConfigHelpers: Relax restrictions on version range Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5613
| * | CMakePackageConfigHelpers: Relax restrictions on version rangeMarc Chevrier2020-12-144-47/+160
|/ /
* | Merge topic 'FindGLUT-macos-tbd' into release-3.19Brad King2020-12-141-2/+10
|\ \ | | | | | | | | | | | | | | | | | | d29d034e2e FindGLUT: Handle Mojave and Big Sur 'tbd' framework files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5601
| * | FindGLUT: Handle Mojave and Big Sur 'tbd' framework filesRobert Maynard2020-12-111-2/+10
| | |
* | | Merge topic 'macos-homebrew-apple-silicon' into release-3.19Brad King2020-12-141-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a5c1a68b6 macOS: Add /opt/homebrew to CMAKE_SYSTEM_PREFIX_PATH on Apple Silicon Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Fons Rademakers <fons.rademakers@cern.ch> Merge-request: !5602
| * | | macOS: Add /opt/homebrew to CMAKE_SYSTEM_PREFIX_PATH on Apple SiliconBrad King2020-12-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | According 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
* | | | Merge topic 'install-properties' into release-3.19Brad King2020-12-141-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63db7ae9c4 cmake: Clear INSTALL file properties between runs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5603
| * | | | cmake: Clear INSTALL file properties between runsBrad King2020-12-111-0/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Do not keep state across separate project configurations. This is particularly important in `cmake-gui` where those configurations can be for separate projects. Fixes: #21580
* | | | Merge topic 'execute_process-command-error' into release-3.19Brad King2020-12-1422-42/+217
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | e5a4ffaad1 execute_process: Improve COMMAND_ERROR_IS_FATAL error capture scenarios Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5588
| * | | execute_process: Improve COMMAND_ERROR_IS_FATAL error capture scenariosAsit Dhal2020-12-1022-42/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge topic 'apple-silicon-host-arch' into release-3.19Brad King2020-12-1122-16/+245
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7f0327dcd Tests: Cover macOS host architecture selection on Apple Silicon hosts 5f882f6ce5 macOS: Offer control over host architecture on Apple Silicon hosts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5589
| * | | | Tests: Cover macOS host architecture selection on Apple Silicon hostsBrad King2020-12-1014-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test cases verifying that `CMAKE_APPLE_SILICON_PROCESSOR` set as either a cache or environment variable causes that to be selected as the host architecture. Also verify that sources compile using whatever is selected as the host architecture, even when the explicit setting is not used. Issue: #21554
| * | | | macOS: Offer control over host architecture on Apple Silicon hostsBrad King2020-12-108-16/+125
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit b6c60f14b6 (macOS: Default to arm64 architecture on Apple Silicon hosts, 2020-09-28, v3.19.0-rc1~63^2) 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
* | | | Merge topic 'doc-3_19_release-fixes' into release-3.19Brad King2020-12-116-65/+78
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff4d1d44f2 Help: Clarify scope details of deferred call ids for cmake_language() b4c02a0a1d Help: Re-sort indexes in the manuals 2c33949c64 Help: Mention how OPTIMIZE_DEPENDENCIES is initialized 0816482302 Help: xref variable that cmake_minimum_required() sets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5598
| * | | Help: Clarify scope details of deferred call ids for cmake_language()Craig Scott2020-12-111-5/+12
| | | | | | | | | | | | Fixes: #21586
| * | | Help: Re-sort indexes in the manualsCraig Scott2020-12-113-60/+60
| | | |
| * | | Help: Mention how OPTIMIZE_DEPENDENCIES is initializedCraig Scott2020-12-111-0/+3
| | | |
| * | | Help: xref variable that cmake_minimum_required() setsCraig Scott2020-12-111-0/+3
|/ / / | | | | | | | | | | | | | | | | | | The CMAKE_MINIMUM_REQUIRED_VERSION has long been set by the cmake_minimum_required() command, but the command docs never mentioned this. Only the variable's own docs stated this but the variable isn't very discoverable without it being mentioned in the command's docs as well.
* | | Merge topic 'rel-macos-apple-silicon' into release-3.19Brad King2020-12-109-13/+161
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56a075eb5d ci: update macOS package to produce universal binaries b184cc256b ci: do not use sccache for macOS packaging 41bddf1028 ci: update to pre-built Qt 5.9.9 universal binaries for macOS packages b201dc0d42 Utilities/Release: Add script to build Qt 5.9.9 macOS universal binaries Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5595
| * | | ci: update macOS package to produce universal binariesBrad King2020-12-103-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update our deployment target to macOS 10.10. This is required by Qt 5.9. Fixes: #21565 Issue: #20825
| * | | ci: do not use sccache for macOS packagingBrad King2020-12-103-6/+7
| | | | | | | | | | | | | | | | It is not compatible with building for multiple architectures.
| * | | ci: update to pre-built Qt 5.9.9 universal binaries for macOS packagesBrad King2020-12-102-3/+3
| | | |
| * | | Utilities/Release: Add script to build Qt 5.9.9 macOS universal binariesBrad King2020-12-102-0/+138
|/ / / | | | | | | | | | | | | These may be used to build a CMake universal binary for macOS that supports both architectures on Apple Silicon and is compatible with OS X 10.10.
* | | Merge topic 'test-macos-version' into release-3.19Brad King2020-12-102-17/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55193c8013 ci: Hard-code XCTest deployment target to 10.15 40877903ac Tests: Remove outdated exclusion of tests on OS X 10.3 c404d7f221 Tests: Add cache entry to control XCTest deployment target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5593
| * | | ci: Hard-code XCTest deployment target to 10.15Brad King2020-12-091-0/+5
| | | | | | | | | | | | | | | | | | | | Avoid using the macOS version running on the CI job host that happens to run the build job.
| * | | Tests: Remove outdated exclusion of tests on OS X 10.3Brad King2020-12-091-12/+1
| | | |
| * | | Tests: Add cache entry to control XCTest deployment targetBrad King2020-12-091-5/+16
| |/ /
* | | Merge topic 'ispc-system-includes' into release-3.19Brad King2020-12-105-2/+37
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 8da25e4a3c ISPC: Treat system includes as '-I' includes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5591
| * | ISPC: Treat system includes as '-I' includesRobert Maynard2020-12-095-2/+37
| | | | | | | | | | | | ISPC doesn't have specific syntax for system includes.
* | | Merge topic 'update_cmp112' into release-3.19Brad King2020-12-082-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cf0c71dae3 Document CMP0112 covers $<TARGET_FILE_NAME,tgt> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5582
| * | | Document CMP0112 covers $<TARGET_FILE_NAME,tgt>Robert Maynard2020-12-072-0/+4
| |/ / | | | | | | | | | Fixes #21559
* | | Merge topic 'FindPython-python2-soabi-suffix-fix' into release-3.19Brad King2020-12-081-2/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | afb0ffcac7 FindPython2: avoid doubling the extension in CPython2 SOABI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5574
| * | | FindPython2: avoid doubling the extension in CPython2 SOABIBen Boeckel2020-12-041-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 951640f1f9 (FindPython: manage SOABI for all Python versions, 2020-08-11) extended support for Python2's SOABI variable in order to support the PyPy interpreter as well. This caused a regression in the way that the SOABI variable was built up for the CPython interpreter. This caused the variable to be set to `.so` which ended up causing a doubling of the resulting `SOABI` variable in the end. Co-Author: Marc Chevrier <marc.chevrier@gmail.com> Fixes: #21548
* | | | Merge topic 'correct_ispc_path_computation' into release-3.19Brad King2020-12-085-15/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9af93fef11 ISPC: Handle OBJECT sources in different directories 72ae15ebcb ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY location Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5581
| * | | | ISPC: Handle OBJECT sources in different directoriesRobert Maynard2020-12-074-9/+23
| | | | |
| * | | | ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY locationRobert Maynard2020-12-071-6/+9
| | |/ / | |/| |
* | | | Merge topic 'remove-partial-intel-compiler-support' into release-3.19Brad King2020-12-084-18/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41b69348a5 Revert "Intel: Add Intel DPC++ compiler identification" f0babb53b3 Revert "Intel: Add Intel Clang compiler identification" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Axel Huebl <axel.huebl@plasma.ninja> Merge-request: !5583
| * | | | Revert "Intel: Add Intel DPC++ compiler identification"Brad King2020-12-073-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 887f3a88a6 (Intel: Add Intel DPC++ compiler identification, 2020-09-21, v3.19.0-rc1~124^2). The compiler has already been released, and is more usable with CMake by pretending to be upstream Clang than by identifying it as a compiler for which we have not implemented support. Fixes: #21551
| * | | | Revert "Intel: Add Intel Clang compiler identification"Brad King2020-12-073-9/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 5c3a93ab88 (Intel: Add Intel Clang compiler identification, 2020-09-29, v3.19.0-rc1~68^2). The compiler has already been released, and is more usable with CMake by pretending to be upstream Clang than by identifying it as a compiler for which we have not implemented support. Issue: #21551
* | | | Merge topic 'asm_arch' into release-3.19Brad King2020-12-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fcabf4a47e macOS: Add architecture flags only for native ASM dialect Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5572
generated by cgit v0.12 at 2025-09-14 20:08:32 (GMT)