summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* create_test_sourcelist: fix typo in placeholder nameSergey Bronnikov2020-12-212-2/+2
| | | | Rename `CMAKE_FUNCTION_TABLE_{ENTIRES => ENTRIES}`.
* CMake Nightly Date StampKitware Robot2020-12-191-1/+1
|
* CMake Nightly Date StampKitware Robot2020-12-181-1/+1
|
* Merge topic 'qt-autogen-per-config'Brad King2020-12-1719-62/+241
|\ | | | | | | | | | | | | | | | | 20e4db4a66 cmGeneratorTarget: Make GetConfigCommonSourceFiles Xcode-specific 92d7b456e5 Autogen: Add support for per-config sources 3ffebbaefb Tests/QtAutogen: Forward build configuration in multi-config generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5624
| * cmGeneratorTarget: Make GetConfigCommonSourceFiles Xcode-specificBrad King2020-12-163-7/+8
| | | | | | | | | | | | The Xcode generator is the only place left that we do not support per-config sources. Make the corresponding helper Xcode-specific to avoid any other new uses.
| * 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 'emacs-extend-cmake-mode'Brad King2020-12-171-0/+62
|\ \ | | | | | | | | | | | | | | | | | | | | | 591d4bbdaf cmake-mode.el: Require the rx package 901386f646 cmake-mode.el: Add navigation by function and macro Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5605
| * | cmake-mode.el: Require the rx packageJoerg Bornemann2020-12-161-0/+1
| | | | | | | | | | | | | | | | | | | | | We're using rx in cmake-mode.el. Technically, we don't have to load the package, because it's already loaded at startup. But it's good style to explicitly require the packages we use, if only to give a quick overview of the package dependencies.
| * | cmake-mode.el: Add navigation by function and macroJoerg Bornemann2020-12-111-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add the functions cmake-beginning-of-defun and cmake-end-of-defun that jump to the beginning/end of the nearest function or macro. Add the function cmake-mark-defun that marks the current function. Bind those functions to the usual keys in cmake-mode-map.
* | | CMake Nightly Date StampKitware Robot2020-12-171-1/+1
| | |
* | | Merge branch 'release-3.19'Brad King2020-12-160-0/+0
|\ \ \
| * | | CMake 3.19.2v3.19.2Brad King2020-12-161-1/+1
| | | |
* | | | Merge topic 'unity-anon-ns'Craig Scott2020-12-1613-3/+172
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 0fe9c40494 Unity Build: Add option for generating per-file unique id Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4784
| * | | Unity Build: Add option for generating per-file unique idStephen Kelly2020-12-1513-3/+172
| | | | | | | | | | | | | | | | Fixes: #21477
* | | | 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
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |