summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ci: build separate macOS packages for macOS 10.13+ and macOS 10.10+Brad King2021-01-079-28/+69
| | | | | | | | | | In order to support modern macOS features like Dark Mode, we need to use Qt 5.15, which requires macOS 10.13. However, we still want to support macOS 10.10 as well, for which we need to use Qt 5.9. Build separate macOS packages for these use cases. Fixes: #21606 Issue: #20825
* Utilities/Release: Add script to build Qt 5.15.2 macOS universal binariesBrad King2021-01-071-0/+125
| | | | | 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.13.
* Utilities/Release: Fix macOS Qt 5.9 build script umaskBrad King2021-01-071-0/+2
| | | | Produce a tarball with world-readable permissions.
* cmake-gui: Fix macOS styling for binaries distributed with Qt 5.10+Brad King2021-01-071-0/+3
| | | | | | | | According to https://bugreports.qt.io/browse/QTBUG-59428, Qt 5.10 and above moved macOS style handling into a separate `qmacstyle` plugin. Install the plugin in our `CMake.app` package on macOS. Issue: #21606
* gitlab-ci: update upload jobs to go to cmake.orgBrad King2021-01-071-1/+1
| | | | | Upload binaries to `cmake.org` through its own name rather than through the `public.kitware.com` alias.
* Merge topic 'FindHDF5-dbg-and-rel' into release-3.19Brad King2021-01-061-1/+1
|\ | | | | | | | | | | | | 5267ba9d63 FindHDF5: Fix finding both debug and release libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5653
| * FindHDF5: Fix finding both debug and release libsKris Thielemans2021-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | Use `target_link_libraries` to set `INTERFACE_LINK_LIBRARIES` so that the `debug` and `optimized` keywords work. In commit a8e0a6b3e4 (FindHDF5: Port changes from VTK, 2020-06-10, v3.19.0-rc1~312^2~1) we added use of `HDF5_LIBRARIES`, but the value may contain `debug` and `optimized` keywords. Fixes: #21637
* | Merge topic 'ci-xcode-12.3' into release-3.19Brad King2021-01-061-4/+4
|\ \ | | | | | | | | | | | | | | | | | | 7b4a50d622 gitlab-ci: update macOS jobs to use Xcode 12.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5670
| * | gitlab-ci: update macOS jobs to use Xcode 12.3Brad King2021-01-061-4/+4
|/ /
* | Merge topic 'FindMPI-oneapi-single-quotes' into release-3.19Brad King2021-01-051-0/+1
|\ \ | |/ |/| | | | | | | | | a5b223aa7f FindMPI: remove single quotes from include path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5654
| * FindMPI: remove single quotes from include pathEduard Valeyev2021-01-041-0/+1
|/ | | | | | | Intel OneAPI's MPI wraps include paths into single quotes, remove them when sanitizing _MPI_INCLUDE_PATH Fixes: #21634
* Merge topic 'rel-linux-aarch64' into release-3.19Brad King2020-12-2314-13/+406
|\ | | | | | | | | | | | | | | | | | | | | 2c1127a7a9 Help: Add 3.19.3 release note for Linux aarch64 binary 76742c4cbe gitlab-ci: add jobs to make Linux release packages for aarch64 on 3.19 branch e14fb01c41 Utilities/Release: Add docker specs for Linux aarch64 binaries 595551a805 gitlab-ci: consolidate Linux release package job spec for x86_64 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Bruno Verachten <gounthar@gmail.com> Merge-request: !5538
| * Help: Add 3.19.3 release note for Linux aarch64 binaryBrad King2020-12-221-0/+5
| |
| * gitlab-ci: add jobs to make Linux release packages for aarch64 on 3.19 branchHi Key2020-12-224-7/+53
| |
| * Utilities/Release: Add docker specs for Linux aarch64 binariesHi Key2020-12-229-0/+347
| | | | | | | | | | | | | | | | Base them on the existing `x86_64` specs. Update the centos base image from centos 6 to centos 7 to get aarch64 support. The resulting binaries require GLIBC 2.17. Fixes: #17923
| * gitlab-ci: consolidate Linux release package job spec for x86_64Brad King2020-12-221-7/+2
| |
* | Merge topic 'fc-relative-SOURCE_DIR' into release-3.19Craig Scott2020-12-224-1/+17
|\ \ | |/ |/| | | | | | | | | 51595e5f01 FetchContent: Relative SOURCE_DIR override cannot be a hard error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5641
| * FetchContent: Relative SOURCE_DIR override cannot be a hard errorCraig Scott2020-12-224-1/+17
| | | | | | Fixes: #21624
* | Merge topic 'test-ConfigSources-config' into release-3.19Brad King2020-12-221-1/+1
|\ \ | |/ |/| | | | | | | | | 3af0671019 Tests: Fix ConfigSources test with empty CMAKE_BUILD_TYPE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5643
| * Tests: Fix ConfigSources test with empty CMAKE_BUILD_TYPEBrad King2020-12-221-1/+1
|/ | | | | | The test requires a non-empty `CMAKE_BUILD_TYPE` to function on single-config generators. Force a non-empty configuration if the test is configured explicitly with empty `-DCMAKE_BUILD_TYPE=`.
* Merge topic 'revert-write-through' into release-3.19Brad King2020-12-211-2/+1
|\ | | | | | | | | | | | | 92021198e5 cmSystemTools: Revert use of MOVEFILE_WRITE_THROUGH by RenameFile on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5628
| * cmSystemTools: Revert use of MOVEFILE_WRITE_THROUGH by RenameFile on WindowsBrad King2020-12-171-2/+1
| | | | | | | | | | | | | | | | | | Revert commit d78c22aa64 (cmSystemTools: Improve RenameFile on Windows with MOVEFILE_WRITE_THROUGH, 2020-08-25, v3.19.0-rc1~243^2~3). Using this flag causes the operation to fail frequently in some environments. Drop it for now pending further investigation. Fixes: #21571
* | Merge topic 'doc-fix-XCODE_LINK_BUILD_PHASE_MODE' into release-3.19Craig Scott2020-12-211-0/+1
|\ \ | |/ |/| | | | | | | | | 2d84b9d145 Help: Fix Sphinx not recognising list in XCODE_LINK_BUILD_PHASE_MODE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5634
| * Help: Fix Sphinx not recognising list in XCODE_LINK_BUILD_PHASE_MODECraig Scott2020-12-201-0/+1
|/
* CMake 3.19.2v3.19.2Brad King2020-12-161-1/+1
|
* Merge topic 'cmake-gui-completion' into release-3.19Brad King2020-12-161-9/+14
|\ | | | | | | | | | | | | 854f5ea1cb cmake-gui: Restore completion during path editing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5619
| * 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