summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.19.3v3.19.3Brad King2021-01-131-1/+1
|
* Merge topic 'trace_expand_bracket' into release-3.19Brad King2021-01-122-1/+2
|\ | | | | | | | | | | | | e6e7f2cab9 cmMakefile: Don't expand bracket arguments in --trace-expand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5687
| * cmMakefile: Don't expand bracket arguments in --trace-expandRaul Tambre2021-01-112-1/+2
| | | | | | | | | | | | Bracket arguments are literal and shouldn't be expanded. Fixes #21671.
* | Merge topic 'cmake-gui-qrc-fix' into release-3.19Brad King2021-01-121-2/+3
|\ \ | |/ |/| | | | | | | | | e20560a2dc cmake-gui: Restore linking of Qt resources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5691
| * cmake-gui: Restore linking of Qt resourcesKyle Edwards2021-01-111-2/+3
|/ | | | | | | | Refactoring in commit 41e223deb3 (CMake GUI: Split up into libraries, add test shim, 2020-09-14, v3.19.0-rc1~116^2~2) broke linking of Qt resources, such as the Add/Remove Entry button icons. Fixes: #21682
* Merge topic 'rel-macos-modern' into release-3.19Brad King2021-01-0813-29/+200
|\ | | | | | | | | | | | | | | | | | | | | 6410425e5b ci: build separate macOS packages for macOS 10.13+ and macOS 10.10+ bbec5a03c8 Utilities/Release: Add script to build Qt 5.15.2 macOS universal binaries 97e238f61b Utilities/Release: Fix macOS Qt 5.9 build script umask 2c5f30b472 cmake-gui: Fix macOS styling for binaries distributed with Qt 5.10+ 3679b74a69 gitlab-ci: update upload jobs to go to cmake.org Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5672
| * 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 'xcode-object-ids' into release-3.19Brad King2021-01-089-40/+85
|\ \ | |/ |/| | | | | | | | | | | | | b8b6573db8 Xcode: Use deterministic object ids for script build phases 2892228dc9 cmGlobalXCodeGenerator: Add infrastructure for deterministic object ids d250b67722 cmGlobalXCodeGenerator: Adopt pbxproj object id generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5671
| * Xcode: Use deterministic object ids for script build phasesBrad King2021-01-065-10/+40
| | | | | | | | | | | | | | | | | | | | The Xcode "new build system" only considers a script build phase up to date if it has run before, even if outputs are newer than inputs. Use a deterministic object id for script build phases associated with custom commands so that they do not need to re-run after CMake re-generates the project. Fixes: #21669
| * cmGlobalXCodeGenerator: Add infrastructure for deterministic object idsBrad King2021-01-062-15/+28
| |
| * cmGlobalXCodeGenerator: Adopt pbxproj object id generationBrad King2021-01-066-28/+30
|/
* 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
| | |