summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ninja Multi-Config: Remove "NMC" from variable namesKyle Edwards2020-02-2712-60/+58
| | | | | | Also rename `..._DEFAULT_BUILD_FILE_CONFIG` to `..._DEFAULT_BUILD_TYPE`. These name changes make the variables meaningful for future use by other generators.
* Merge topic 'backport-ctest-resource-allocation-doc' into release-3.17Brad King2020-02-261-0/+9
|\ | | | | | | | | | | | | 3bff839706 Help: Clarify that the CTest resource allocation feature doesn't oversubscribe Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4401
| * Help: Clarify that the CTest resource allocation feature doesn't oversubscribeKyle Edwards2020-02-261-0/+9
|/
* Merge topic 'cmake-cfg-intdir-ninja-multi' into release-3.17Brad King2020-02-261-0/+7
|\ | | | | | | | | | | | | 853c3eac6d Help: Note that CMAKE_CFG_INTDIR is not fully supported on Ninja Multi-Config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4397
| * Help: Note that CMAKE_CFG_INTDIR is not fully supported on Ninja Multi-ConfigKyle Edwards2020-02-251-0/+7
| |
* | Merge topic 'RunCMake-test-lang' into release-3.17Brad King2020-02-261-0/+3
|\ \ | | | | | | | | | | | | | | | | | | 95dbcf0598 Tests: fix RunCMake.Make test when run on systems with non-english locale Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4389
| * | Tests: fix RunCMake.Make test when run on systems with non-english localeRolf Eike Beer2020-02-261-0/+3
| | | | | | | | | | | | | | | | | | Set `LANG=C` in the environment so the output of `make` is predictable. Fixes: #19689
* | | Merge topic 'ninja-multi-fix-macos-failures' into release-3.17Brad King2020-02-262-3/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | cc4e304800 Tests: Fix CFBundleTest for Ninja Multi-Config bcf4da52d8 Tests: Fix CustComDepend test for Ninja Multi-Config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4396
| * | Tests: Fix CFBundleTest for Ninja Multi-ConfigKyle Edwards2020-02-251-1/+1
| | |
| * | Tests: Fix CustComDepend test for Ninja Multi-ConfigKyle Edwards2020-02-251-2/+2
|/ /
* | Merge topic 'ctest-failure-error-reporting' into release-3.17Brad King2020-02-259-27/+119
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | a5be3916ee CTest: Provide more detailed information on resource allocation error f0df3ed5b9 Refactor: Provide more detailed error information from TryAllocateResources() f1c34443b7 CTest: Improve error reporting with bad working directory for tests 1dec359422 Refactor: Require detail when calling cmCTestRunTest::StartFailure() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4390
| * | CTest: Provide more detailed information on resource allocation errorKyle Edwards2020-02-246-4/+72
| | |
| * | Refactor: Provide more detailed error information from TryAllocateResources()Kyle Edwards2020-02-242-16/+37
| | |
| * | CTest: Improve error reporting with bad working directory for testsKyle Edwards2020-02-242-2/+2
| | |
| * | Refactor: Require detail when calling cmCTestRunTest::StartFailure()Kyle Edwards2020-02-243-8/+11
| |/
* | Merge topic 'FindCUDA-no-threads-target' into release-3.17Brad King2020-02-251-1/+5
|\ \ | | | | | | | | | | | | | | | | | | b9d67447c3 FindCUDA: Only depend on Threads::Threads on platforms that need it Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4377
| * | FindCUDA: Only depend on Threads::Threads on platforms that need itRobert Maynard2020-02-241-1/+5
| | | | | | | | | | | | | | | | | | | | | In commit 46371132b3 (FindCUDA: CUDA_LIBRARIES doesn't contain raw `-pthread`, 2019-11-11, v3.17.0-rc1~455^2) we introduced use of the `Threads::Threads` target, but we do not `find_package(Threads)` on all platforms. Use the target only if it exists.
* | | Merge topic 'FindPkgConfig-scope' into release-3.17Brad King2020-02-251-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c3e0d1ffe9 FindPkgConfig: set policies CMP0054 and CMP0057 to new Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4388
| * | | FindPkgConfig: set policies CMP0054 and CMP0057 to newRolf Eike Beer2020-02-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | One may encounter warnings if FindPkgConfig is used in any project, even indirectly, that has set any of these policies to old explicitely or requires an older version.
* | | | Merge topic 'cuda-non-device-link' into release-3.17Brad King2020-02-252-3/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 7da2c8c543 Merge branch 'backport-cuda-non-device-link' 738f3f23aa Ninja: Do not use nvcc response files with non-nvcc tools Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4376
| * | | Merge branch 'backport-cuda-non-device-link'Brad King2020-02-242-3/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Ninja: Do not use nvcc response files with non-nvcc toolsFrancisco Facioni2020-02-242-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit d91b5a72cd (Ninja: Add support for CUDA nvcc response files, 2019-05-30, v3.15.0-rc1~8^2) we use NVCC's `--options-file` option to avoid long link command lines via a response file. However, for non-device linking the host tools are used and the option does not make sense. Update the logic to use `--options-file` only for device linking. Linking with the host tools already has its own logic for response files. Fixes: #19954
* | | | Merge topic 'pch-create-via-include' into release-3.17Brad King2020-02-243-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c6d6ec27c PCH: Clang: Update PCH usage flags to include original header Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4360
| * | | | PCH: Clang: Update PCH usage flags to include original headerSergey Larin2020-02-243-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an additional include flag to PCH usage command line to fix programs that rely on `compile_commands.json` file. Pass it to the preprocessor directly to avoid compiler driver to change it to '-include-pch'. When preprocessor is requested to preprocess a file, it tries to get the original filename from '.pch' and uses that file for preprocessing. CMake generates a '.pch' file from the '.hxx' file by passing an empty '.cxx' source file to the compiler as a compilation unit and the header file with the '-include' flag. After that, compiler puts compilation unit filename in the '.pch' as the original filename. However, CMake build system uses empty file as the source file and passes the header file using '-include-pch' flag. As a result, Clang uses the wrong file for preprocessing and produces the corrupted preprocessed file. Fixes: #20355 Signed-off-by: Sergey Larin <cerg2010cerg2010@mail.ru>
* | | | Merge topic 'update-kwsys' into release-3.17Brad King2020-02-182-6/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce59cabc70 KWSys: SystemTools: CopyFileIfDifferent: Fix endless recursion Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4361
| * | | | KWSys: SystemTools: CopyFileIfDifferent: Fix endless recursionBrad King2020-02-182-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport KWSys commit `ea77593a1` (SystemTools: CopyFileIfDifferent: Fix endless recursion, 2020-02-13) for the CMake 3.17 branch. Fixes: #20347
* | | | | Merge topic 'swift-exe-rpath' into release-3.17Brad King2020-02-181-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 321df5783d Swift: support `-rpath` for executables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4365
| * | | | | Swift: support `-rpath` for executablesSaleem Abdulrasool2020-02-171-0/+5
| | |/ / / | |/| | | | | | | | | | | | | This adjusts the flags to enable setting the RPATH for executables.
* | | | | Merge topic 'ninja-multi-framework-dependency-autogen-fix' into release-3.17Brad King2020-02-1829-87/+152
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7abc3d61ac Ninja Multi-Config: Fix issue with framework dependencies and Autogen Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4363
| * | | | | Ninja Multi-Config: Fix issue with framework dependencies and AutogenKyle Edwards2020-02-1729-87/+152
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20345
* | | | | | Merge topic 'git-config-with-spaces' into release-3.17Brad King2020-02-175-13/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef3194a6f8 ExternalProject: Quote each git --config option to handle spaces 40d1d29cfa Tests: Add missing ExternalProject smoke tests afc8956765 Tests: Fix test_clean target missing some test directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4364
| * | | | | ExternalProject: Quote each git --config option to handle spacesCraig Scott2020-02-152-2/+4
| | | | | | | | | | | | | | | | | | Fixes: #20354
| * | | | | Tests: Add missing ExternalProject smoke testsCraig Scott2020-02-151-0/+8
| | | | | |
| * | | | | Tests: Fix test_clean target missing some test directoriesCraig Scott2020-02-153-11/+16
| |/ / / /
* | | | | Merge topic 'doc-ascii' into release-3.17Brad King2020-02-122-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5d7c29137 Help: Replace UTF-8 apostrophe with ascii apostrophe Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4358
| * | | | Help: Replace UTF-8 apostrophe with ascii apostropheBrad King2020-02-122-4/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | Also replace UTF-8 graphical characters with simple dashes. Fixes: #20349
* | | | CMake 3.17.0-rc1v3.17.0-rc1Brad King2020-02-121-1/+1
| | | |
* | | | Merge topic 'doc-cpack' into release-3.17Brad King2020-02-121-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3af0b33ec6 Help: module CPack: Make internal hyperlink target more unique Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4353
| * | | | Help: module CPack: Make internal hyperlink target more uniqueBrad King2020-02-121-3/+3
| | | | | | | | | | | | | | | | | | | | We already have a `.. _targets:` in `Help/command/install.rst`.
* | | | | Merge topic 'doc-cpack' into release-3.17Brad King2020-02-121-10/+31
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59e9f33d78 Help: module CPack: New section on targets. f33708eed9 Help: module CPack: add cross-reference to cpack-generators(7). 4949e1261a Help: module CPack. Explain usage of the build targets. 72eaeb41f5 Help: module CPack: correction: 2 config files are generated, not just 1 c35a9ff9c3 Help: CPack module: Correct the summary (configure, not build) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4352
| * | | | Help: module CPack: New section on targets.Joachim Wuttke (o)2020-02-121-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | To explain in full detail to what extent the targets package and package_source are supported by different generators.
| * | | | Help: module CPack: add cross-reference to cpack-generators(7).Joachim Wuttke (o)2020-02-121-0/+2
| | | | |
| * | | | Help: module CPack. Explain usage of the build targets.Joachim Wuttke (o)2020-02-121-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Explain the usage of the two new build targets, package and package_source.
| * | | | Help: module CPack: correction: 2 config files are generated, not just 1Joachim Wuttke (o)2020-02-121-3/+4
| | | | | | | | | | | | | | | | | | | | Besides CPackConfig.cmake, the module also generates CPackSourceConfig.cmake.
| * | | | Help: CPack module: Correct the summary (configure, not build)Joachim Wuttke (o)2020-02-121-1/+1
| |/ / / | | | | | | | | | | | | | | | | Including CPack does not "build" installers. It just *configures* them.
* | | | Merge topic 'PrintSystemInformation' into release-3.17Brad King2020-02-121-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e9328a00d Help: CMakePrintSystemInformation.cmake: Minor corrections. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4351
| * | | | Help: CMakePrintSystemInformation.cmake: Minor corrections.Joachim Wuttke (o)2020-02-121-2/+2
| |/ / / | | | | | | | | | | | | | | | | Punctuation. "file" -> "module"
* | | | Merge topic 'cpack-ifw-qt-links' into release-3.17Brad King2020-02-122-38/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e240371ab1 Help: CPackIFWGenerator: explain relation to CPackIWF 78779c6111 Help: Show external link only once per page; explain abbreviation QtIFW. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4348
| * | | | Help: CPackIFWGenerator: explain relation to CPackIWFJoachim Wuttke (o)2020-02-112-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | * Make overview more focussed * Explain the relation to CPackIFW
| * | | | Help: Show external link only once per page; explain abbreviation QtIFW.Joachim Wuttke (o)2020-02-112-31/+26
| |/ / /
generated by cgit v0.12 at 2024-11-12 01:20:22 (GMT)