summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Makefiles: Add support of DEPFILE for add_custom_commandMarc Chevrier2020-12-2320-79/+309
| | | | | Issue: #20286 Fixes: #21415
* cmGccDepfileReader: Add new function ensuring paths are validMarc Chevrier2020-12-233-15/+43
| | | | And cmTransformDepfile now rely on this new function.
* CMake Nightly Date StampKitware Robot2020-12-231-1/+1
|
* Merge branch 'release-3.19'Craig Scott2020-12-220-0/+0
|\
| * 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
* | \ Merge topic 'fc-relative-SOURCE_DIR'Craig 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 branch 'release-3.19'Brad King2020-12-220-0/+0
|\ \ \ | | |/ | |/|
| * | 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
* | | Merge topic 'test-ConfigSources-config'Brad 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 'external-project-drop-success'Brad King2020-12-221-2/+4
|\ \ | | | | | | | | | | | | | | | | | | 850de767e9 ExternalProject: Silence step succeeded message when using Ninja Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5625
| * | ExternalProject: Silence step succeeded message when using NinjaDaan De Meyer2020-12-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When doing an ExternalProject superbuild with all output logged to files, the output currently looks as follows: ``` [652/904] Performing install step for 'plasma-framework' -- plasma-framework install command succeeded. See also /root/build/kde/frameworks/plasma-framework/log/plasma-framework-install-*.log [658/904] Performing build step for 'khtml' -- khtml build command succeeded. See also /root/build/kde/frameworks/khtml/log/khtml-build-*.log [659/904] Performing install step for 'khtml' -- khtml install command succeeded. See also /root/build/kde/frameworks/khtml/log/khtml-install-*.log [661/904] Performing configure step for 'krunner' -- krunner configure command succeeded. See also /root/build/kde/frameworks/krunner/log/krunner-configure-*.log [661/904] Performing build step for 'krunner' ``` More specifically, because a success line is printed for every succeeded step, we lose the advantage of Ninja's progress bar which will now also print a new line instead of updating the same link as happens when using Ninja in a normal CMake project. By silencing the success message when using the Ninja generator, Ninja's progress bar works as expected and updates inline instead of printing a new line for each progress update. With this change, the above output is reduced to a single line progress bar: ``` [661/904] Performing build step for 'krunner' ```
* | | Merge topic 'issue-20134'Brad King2020-12-229-5/+76
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b68699b717 target_include_directories: Support AFTER option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5633
| * | | target_include_directories: Support AFTER optionAsit Dhal2020-12-199-5/+76
| | | | | | | | | | | | | | | | Fixes: #20134
* | | | Merge topic 'issue-15653'Brad King2020-12-2229-18/+339
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3385dd8bd file(GENERATE): Support options to manipulate file permissions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5437
| * | | | file(GENERATE): Support options to manipulate file permissionsAsit Dhal2020-12-2129-18/+339
| | | | | | | | | | | | | | | | | | | | Fixes: #15653
* | | | | Merge topic 'doc-add_test-config-genex'Brad King2020-12-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af7882ba6e Help: replace deprecated $<CONFIGURATION> generator expression Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5636
| * | | | | Help: replace deprecated $<CONFIGURATION> generator expressionNeroBurner2020-12-211-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | The `$<CONFIGURATION>` genex has been deprecated since CMake 3.0. Use `$<CONFIG>` instead in the `add_test` example.
* | | | | Merge topic 'create_test_sourcelist-typo'Brad King2020-12-222-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0273293047 create_test_sourcelist: fix typo in placeholder name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5632
| * | | | | create_test_sourcelist: fix typo in placeholder nameSergey Bronnikov2020-12-212-2/+2
| | |/ / / | |/| | | | | | | | | | | | | Rename `CMAKE_FUNCTION_TABLE_{ENTIRES => ENTRIES}`.
* | | | | Merge topic 'FindOpenSSL-win-arch'Brad King2020-12-221-5/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6e03b2e6f FindOpenSSL: Distinguish 32-bit and 64-bit search paths on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5630
| * | | | | FindOpenSSL: Distinguish 32-bit and 64-bit search paths on WindowsMa Br2020-12-211-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21611
* | | | | | Merge topic 'apple-missing-framework'Brad King2020-12-226-13/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ab77201f7 Apple: Fix linking to frameworks that do not exist until build time Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5638
| * | | | | | Apple: Fix linking to frameworks that do not exist until build timeBrad King2020-12-216-13/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21621
* | | | | | | CMake Nightly Date StampKitware Robot2020-12-221-1/+1
|/ / / / / /
* | | | | | Merge topic 'ctest-test-dir'Brad King2020-12-2110-2/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dbcf86d24d Ctest: Support build tree on command line Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5623
| * | | | | | Ctest: Support build tree on command lineAsit Dhal2020-12-1710-2/+64
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Fixes: #21268
* | | | | | Merge topic 'make-CMAKE_EXECUTABLE_FORMAT-internal'Brad King2020-12-211-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc8162a981 CMakeDetermineCompilerId: Ensure CMAKE_EXECUTABLE_FORMAT is INTERNAL Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !5627
| * | | | | | CMakeDetermineCompilerId: Ensure CMAKE_EXECUTABLE_FORMAT is INTERNALCraig Scott2020-12-171-2/+2
| | | | | | | | | | | | | | | | | | | | | Fixes: #21607
* | | | | | | Merge branch 'release-3.19'Brad King2020-12-210-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | 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
* | \ \ \ \ \ \ Merge topic 'revert-write-through'Brad 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 branch 'release-3.19'Craig Scott2020-12-210-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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
* | | | | | | | Merge topic 'doc-fix-XCODE_LINK_BUILD_PHASE_MODE'Craig 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 Nightly Date StampKitware Robot2020-12-211-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2020-12-201-1/+1
| |_|_|_|/ |/| | | |
* | | | | 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
| |_|_|/ |/| | |