summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Autogen: Add support for per-config sourcesBrad King2020-12-1616-54/+229
| | | | Fixes: #20682
* Tests/QtAutogen: Forward build configuration in multi-config generatorsBrad King2020-12-161-1/+4
|
* Merge topic 'custom-command-output-genex-nmc'Brad King2020-12-1683-255/+1273
|\ | | | | | | | | | | | | | | | | | | | | | | 1526ae3aba Tests: Add cases for Ninja Multi-Config cross-config custom commands dcf9f4d2f7 Ninja Multi-Config: Add support for cross-config custom commands 15467f12f7 cmLocalGenerator: Adopt custom target 'force' output name generation 7b64b0cd5a cmLocalGenerator: Refactor custom command generator construction d29da8ed3e cmMakefile: Simplify custom target 'force' output name generation 2b1cc175ee Help: Clarify version adding add_custom_{command,target} OUTPUT genex support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5612
| * Tests: Add cases for Ninja Multi-Config cross-config custom commandsBrad King2020-12-1563-0/+564
| |
| * Ninja Multi-Config: Add support for cross-config custom commandsKyle Edwards2020-12-1517-105/+547
| | | | | | | | Co-Author: Brad King <brad.king@kitware.com>
| * cmLocalGenerator: Adopt custom target 'force' output name generationBrad King2020-12-154-32/+27
| |
| * cmLocalGenerator: Refactor custom command generator constructionBrad King2020-12-155-85/+113
| | | | | | | | | | | | | | Add support for constructing and using multiple generators for one custom command. cmGeneratorTarget contains a code path that needs this behavior when used with Ninja but not other generators, so use virtual dispatch through cmLocalGenerator.
| * cmMakefile: Simplify custom target 'force' output name generationBrad King2020-12-155-32/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary check of policy CMP0049. The policy can never trigger on our internally-generated name because it has no variable references. The rename in commit 0ed5ce4cd8 (cmTarget: Rename AddSource method for backward compatibility., 2014-03-17, v3.1.0-rc1~688^2~17) made it look like this code path depended on CMP0049. Then commit 0e1faa28cb (cmMakefile: Separate custom command setup from actual creation, 2019-09-14, v3.16.0-rc1~85^2) and commit ea1bed34b2 (cmMakefile: Extract utilities used for creation of custom commands, 2019-09-21, v3.16.0-rc1~52^2~1) built additional infrastructure to thread that dependence through the call stack. Remove it all.
| * Help: Clarify version adding add_custom_{command,target} OUTPUT genex supportBrad King2020-12-152-34/+39
| | | | | | | | | | | | | | Update the documentation added by commit c257c25419 (add_custom_{command,target}: Add genex support to OUTPUT and BYPRODUCTS, 2020-10-19) to use sphinx markup instead of prose to specify the version in which the feature was added.
* | Merge topic 'cmake-gui-system-icon'Brad King2020-12-161-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 47649baf60 cmake-gui: Use icon from system theme if available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5616
| * | cmake-gui: Use icon from system theme if availableLoren Burkholder2020-12-151-1/+1
| |/
* | Merge branch 'release-3.19'Brad King2020-12-160-0/+0
|\ \
| * \ 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
* | \ \ Merge topic 'cmake-gui-completion'Brad 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
* | | CMake Nightly Date StampKitware Robot2020-12-161-1/+1
| | |
* | | Merge topic 'FindQt3-find-sig'Brad King2020-12-151-2/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 38fce6d23b FindQt3: Add missing NAMES/PATHS keywords to find_ calls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5611
| * | | FindQt3: Add missing NAMES/PATHS keywords to find_ callsBrad King2020-12-141-2/+5
| | |/ | |/| | | | | | | | | | | | | These are needed when using `PATH_SUFFIXES` to get the full signatures. Fixes: #21594
* | | Merge topic 'issue-20915'Brad King2020-12-1514-35/+99
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6d0712c225 file(configure): Order of named options should be specified in any order Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5608
| * | | file(configure): Order of named options should be specified in any orderAsit Dhal2020-12-1314-35/+99
| | | | | | | | | | | | | | | | Fixes: #20915
* | | | Merge topic 'issue-21557-test-cases'Brad King2020-12-1530-0/+92
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8851637e9f cmake_policy: Implement test cases for cmake_policy VERSION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5610
| * | | | cmake_policy: Implement test cases for cmake_policy VERSIONAsit Dhal2020-12-1430-0/+92
| |/ / /
* | | | Merge topic 'issue-21557'Brad King2020-12-151-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99a98eefac cmake_policy: Add check for return value of SetPolicyVersion Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5607
| * | | | cmake_policy: Add check for return value of SetPolicyVersionAsit Dhal2020-12-141-2/+1
| |/ / / | | | | | | | | | | | | Fixes: #21557
* | | | Merge branch 'release-3.19'Brad King2020-12-150-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
* | \ \ \ Merge topic 'ispc_control_header_suffixes'Brad 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 branch 'release-3.19'Brad King2020-12-150-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
* | \ \ \ \ Merge topic 'support_CMAKE_VFS_OVERLAY_for_rc_compilation'Brad 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 branch 'release-3.18'Brad King2020-12-150-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'backport-ninja-no-cleandead' into release-3.18Brad King2020-12-142-15/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !5614
* | \ \ \ \ \ Merge branch 'release-3.17'Brad King2020-12-150-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'backport-ninja-no-cleandead' into release-3.17Brad King2020-12-142-15/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | Merge-request: !5614
* | | | | | | | Merge branch 'release-3.19'Brad King2020-12-150-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | 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 topic 'ninja-no-cleandead'Brad 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 branch 'release-3.19'Brad King2020-12-150-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | 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
* | \ \ \ \ \ \ \ Merge topic 'rel-macos-apple-silicon'Brad 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 branch 'release-3.19'Craig Scott2020-12-150-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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
* | | | | | | | Merge topic 'CMakePackageConfigHelpers-version-range'Craig Scott2020-12-154-46/+159
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70b69b6aaf Merge branch 'backport-3.19-CMakePackageConfigHelpers-version-range' into CMakePackageConfigHelpers-version-range 55c3b6a77e CMakePackageConfigHelpers: Relax restrictions on version range 7f44760991 CMakePackageConfigHelpers: Relax restrictions on version range Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5613
| * \ \ \ \ \ \ \ Merge branch 'backport-3.19-CMakePackageConfigHelpers-version-range' into ↵Craig Scott2020-12-140-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | CMakePackageConfigHelpers-version-range
| | * | | | | | | CMakePackageConfigHelpers: Relax restrictions on version rangeMarc Chevrier2020-12-144-47/+160
| | |/ / / / / /