summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.17'Brad King2020-03-300-0/+0
|\
| * Merge topic 'llvm_rc_pp' into release-3.17Brad King2020-03-301-1/+1
| |\ | | | | | | | | | | | | | | | | | | 4bef0e6450 llvm-rc: Enable preprocessing if CMAKE_RC_COMPILER_INIT is an absolute path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4535
* | \ Merge topic 'llvm_rc_pp'Brad King2020-03-301-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 4bef0e6450 llvm-rc: Enable preprocessing if CMAKE_RC_COMPILER_INIT is an absolute path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4535
| * | llvm-rc: Enable preprocessing if CMAKE_RC_COMPILER_INIT is an absolute pathLucas Wang2020-03-271-1/+1
| | | | | | | | | | | | | | | `CMAKE_RC_COMPILER_INIT` and `CMAKE_RC_COMPILER` can be set by user, for example `llvm-rc-10` and `D:\LLVM\bin\llvm-rc.exe`.
* | | Merge topic 'FindPython-use-sysconfig-package'Brad King2020-03-301-12/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dd0664415a FindPython: use 'sysconfig' as alternate to 'distutils.sysconfig' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4540
| * | | FindPython: use 'sysconfig' as alternate to 'distutils.sysconfig'Marc Chevrier2020-03-281-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To support any python installation, if package 'distutils.sysconfig' is not available, try to use package 'sysconfig'. Fixes: #20502
* | | | CMake Nightly Date StampKitware Robot2020-03-301-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2020-03-291-1/+1
|/ / /
* | | Merge branch 'release-3.17'Craig Scott2020-03-280-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'ninja-multi-doc-variable-update' into release-3.17Craig Scott2020-03-284-43/+35
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | c8fd26eb57 Help: Move Ninja Multi-Config variable details into their respective pages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4532
* | \ \ Merge topic 'ninja-multi-doc-variable-update'Craig Scott2020-03-284-43/+35
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | c8fd26eb57 Help: Move Ninja Multi-Config variable details into their respective pages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4532
| * | | Help: Move Ninja Multi-Config variable details into their respective pagesKyle Edwards2020-03-264-43/+35
| | | |
* | | | CMake Nightly Date StampKitware Robot2020-03-281-1/+1
| | | |
* | | | Merge topic 'pch-warn-invalid'Brad King2020-03-2713-7/+86
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ce08e5489 PCH: add an option to disable `-Winvalid-pch` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4499
| * | | | PCH: add an option to disable `-Winvalid-pch`Cristian Adam2020-03-2613-7/+86
| | | | | | | | | | | | | | | | | | | | Fixes: #20295
* | | | | Merge topic 'doc-cmake-package-targets'Brad King2020-03-271-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6344586ee install: Document caveat when EXPORT name matches package name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4527
| * | | | | install: Document caveat when EXPORT name matches package nameBrad King2020-03-261-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20427
* | | | | | Merge topic 'cleanup-endls-1'Brad King2020-03-279-111/+101
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fdd8db3aa Refactor: Avoid `std::endl` where it's not necessary (part 1) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4513
| * | | | | | Refactor: Avoid `std::endl` where it's not necessary (part 1)Alex Turbov2020-03-269-111/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `std::endl` manupulator, except inserting `\n` character, also performs `os.flush()`, which may leads to undesired effects (like disk I/O in the middle of forming data strings). For the `std::stringstream` it also has no meaning.
* | | | | | | Merge topic 'cmprop-getglobalprop'Brad King2020-03-2719-83/+95
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c84cf42897 cmState::GetGlobalProperty: return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4521
| * | | | | | | cmState::GetGlobalProperty: return cmPropVitaly Stakhovsky2020-03-2519-83/+95
| | | | | | | |
* | | | | | | | Merge topic 'cmprop-state'Brad King2020-03-2711-29/+32
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7f2ff16a4 cmState::GetCacheEntryProperty: return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4522
| * | | | | | | | cmState::GetCacheEntryProperty: return cmPropVitaly Stakhovsky2020-03-2511-29/+32
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'export-error-on-multuple-calls'Brad King2020-03-2712-2/+114
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0cd20e8f62 export(): raise an error on multiple calls with same FILE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4510
| * | | | | | | | export(): raise an error on multiple calls with same FILEMarc Chevrier2020-03-2612-2/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: 20472
* | | | | | | | | Merge branch 'release-3.17'Brad King2020-03-270-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge topic 'ctest-timeout-report' into release-3.17Brad King2020-03-274-10/+16
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7fda917fa4 CTest: Fix reported duration on timeout when grindchild keeps pipes open Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4530
* | \ \ \ \ \ \ \ \ Merge topic 'ctest-timeout-report'Brad King2020-03-274-10/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3503a79639 Merge branch 'backport-ctest-timeout-report' into ctest-timeout-report 7fda917fa4 CTest: Fix reported duration on timeout when grindchild keeps pipes open Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4530
| * \ \ \ \ \ \ \ \ \ Merge branch 'backport-ctest-timeout-report' into ctest-timeout-reportBrad King2020-03-264-10/+16
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | CTest: Fix reported duration on timeout when grindchild keeps pipes openBrad King2020-03-264-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit d1976cd1f2 (CTest: Fix timeout when grandchild keeps pipes open, 2020-01-13, v3.17.0-rc1~169^2) we no longer hang, but the test duration we report after the timeout is the amount of time the immediate child ran before exiting. Fix the logic to instead report the actual amount of time we spent monitoring the test before the timeout. Fixes: #20509
* | | | | | | | | | Merge branch 'release-3.17'Brad King2020-03-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'vs-clangcl' into release-3.17Brad King2020-03-271-1/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3d7a15010 VS: Fix ClangCL toolset compiler path detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4523
* | \ \ \ \ \ \ \ \ \ Merge topic 'vs-clangcl'Brad King2020-03-271-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3d7a15010 VS: Fix ClangCL toolset compiler path detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4523
| * | | | | | | | | | VS: Fix ClangCL toolset compiler path detectionBrad King2020-03-261-1/+3
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to commit 3c125c6de0 (VS: Support Visual Studio Clang Toolkit identification, 2019-12-03, v3.17.0-rc1~341^2) using `-T ClangCL` would work but `CMAKE_{C,CXX}_COMPILER` would be detected as `cl.exe` even though `clang-cl.exe` is the actual compiler. That commit attempted to fix the detection by using `$(ClangClExecutable)` as we do for LLVM-distributed toolsets, but that is not actually defined. Instead, look for `$(CLToolExe)` in the `PATH`. Fixes: #20504
* | | | | | | | | | Merge branch 'release-3.17'Brad King2020-03-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'FindPython-variable-spelling-error' into release-3.17Brad King2020-03-271-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63580668a8 FindPython: fix variable spelling error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4529
* | \ \ \ \ \ \ \ \ \ Merge topic 'FindPython-variable-spelling-error'Brad King2020-03-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63580668a8 FindPython: fix variable spelling error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4529
| * | | | | | | | | | FindPython: fix variable spelling errorMarc Chevrier2020-03-261-1/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'release-3.17'Brad King2020-03-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'CheckIPOSupported-cleanup-cache' into release-3.17Brad King2020-03-271-2/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b8297721f CheckIPOSupported: Avoid polluting cache with common name 'result' Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4528
* | \ \ \ \ \ \ \ \ \ Merge topic 'CheckIPOSupported-cleanup-cache'Brad King2020-03-271-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b8297721f CheckIPOSupported: Avoid polluting cache with common name 'result' Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4528
| * | | | | | | | | | CheckIPOSupported: Avoid polluting cache with common name 'result'Brad King2020-03-261-2/+4
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20508
* | | | | | | | | | Merge branch 'release-3.17'Brad King2020-03-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'nmc-cl-showincludes' into release-3.17Brad King2020-03-271-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c7e6b1e49 Ninja Multi-Config: Fix MSVC showincludes prefix detection Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4526
* | | | | | | | | | Merge topic 'nmc-cl-showincludes'Brad King2020-03-271-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c7e6b1e49 Ninja Multi-Config: Fix MSVC showincludes prefix detection Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4526
| * | | | | | | | | Ninja Multi-Config: Fix MSVC showincludes prefix detectionBrad King2020-03-261-1/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Activate the detection logic for this generator too. Fixes: #20506
* | | | | | | | | Merge branch 'release-3.17'Brad King2020-03-270-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'llvm-rc-stderr' into release-3.17Brad King2020-03-274-3/+13
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc93cbb0d8 llvm-rc: Print stderr output when calling tools through cmake_llvm_rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4525
* | \ \ \ \ \ \ \ \ Merge topic 'llvm-rc-stderr'Brad King2020-03-274-3/+13
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc93cbb0d8 llvm-rc: Print stderr output when calling tools through cmake_llvm_rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4525
| * | | | | | | | | llvm-rc: Print stderr output when calling tools through cmake_llvm_rcThomas Bernard2020-03-264-3/+13
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The stored error pipe is output if the program fails. Fixes: #20494