mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-11 20:11:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
47,436 Commits 2 Branches 393 Tags
f6704357159366fc404491e02f1ea6cee87f0989
Commit Graph

47436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
f670435715 Merge topic 'pch-warn-invalid' 
2ce08e5489 PCH: add an option to disable `-Winvalid-pch`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4499
 2020-03-27 08:03:30 -04:00
Brad King
cc1d5a436b Merge topic 'doc-cmake-package-targets' 
e6344586ee install: Document caveat when EXPORT name matches package name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4527
 2020-03-27 07:58:39 -04:00
Brad King
d6119e2305 Merge topic 'cleanup-endls-1' 
3fdd8db3aa Refactor: Avoid `std::endl` where it's not necessary (part 1)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4513
 2020-03-27 07:51:27 -04:00
Brad King
a6611577c3 Merge topic 'cmprop-getglobalprop' 
c84cf42897 cmState::GetGlobalProperty: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4521
 2020-03-27 07:50:28 -04:00
Brad King
7e3d81b1df Merge topic 'cmprop-state' 
a7f2ff16a4 cmState::GetCacheEntryProperty: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4522
 2020-03-27 07:49:30 -04:00
Brad King
ae96b772fa Merge topic 'export-error-on-multuple-calls' 
0cd20e8f62 export(): raise an error on multiple calls with same FILE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4510
 2020-03-27 07:48:30 -04:00
Brad King
767a875fee Merge branch 'release-3.17' 2020-03-27 07:46:15 -04:00
Brad King
0613f1b245 Merge topic 'ctest-timeout-report' 
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
 2020-03-27 07:46:15 -04:00
Brad King
b835c5d5c9 Merge topic 'ctest-timeout-report' into release-3.17 
7fda917fa4 CTest: Fix reported duration on timeout when grindchild keeps pipes open

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4530
 2020-03-27 07:46:14 -04:00
Brad King
e50c02c009 Merge branch 'release-3.17' 2020-03-27 07:45:15 -04:00
Brad King
efb2a9f093 Merge topic 'vs-clangcl' into release-3.17 
f3d7a15010 VS: Fix ClangCL toolset compiler path detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4523
 2020-03-27 07:45:15 -04:00
Brad King
112cb248ae Merge topic 'vs-clangcl' 
f3d7a15010 VS: Fix ClangCL toolset compiler path detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4523
 2020-03-27 07:45:15 -04:00
Brad King
311848f790 Merge topic 'FindPython-variable-spelling-error' into release-3.17 
63580668a8 FindPython: fix variable spelling error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4529
 2020-03-27 07:44:12 -04:00
Brad King
9a585fc038 Merge branch 'release-3.17' 2020-03-27 07:44:12 -04:00
Brad King
83f5ba06df Merge topic 'FindPython-variable-spelling-error' 
63580668a8 FindPython: fix variable spelling error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4529
 2020-03-27 07:44:12 -04:00
Brad King
7a4cc3b9c3 Merge branch 'release-3.17' 2020-03-27 07:43:03 -04:00
Brad King
9df587168a Merge topic 'CheckIPOSupported-cleanup-cache' 
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
 2020-03-27 07:43:03 -04:00
Brad King
f6c3820549 Merge topic 'CheckIPOSupported-cleanup-cache' into release-3.17 
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
 2020-03-27 07:43:02 -04:00
Brad King
7489ac6f52 Merge branch 'release-3.17' 2020-03-27 07:41:58 -04:00
Brad King
184dd23d2e Merge topic 'nmc-cl-showincludes' 
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
 2020-03-27 07:41:58 -04:00
Brad King
1915a09884 Merge topic 'nmc-cl-showincludes' into release-3.17 
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
 2020-03-27 07:41:57 -04:00
Brad King
3ee4d19ec8 Merge branch 'release-3.17' 2020-03-27 07:39:30 -04:00
Brad King
a88b27bfc7 Merge topic 'llvm-rc-stderr' 
dc93cbb0d8 llvm-rc: Print stderr output when calling tools through cmake_llvm_rc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4525
 2020-03-27 07:39:30 -04:00
Brad King
2fe8ea555e Merge topic 'llvm-rc-stderr' into release-3.17 
dc93cbb0d8 llvm-rc: Print stderr output when calling tools through cmake_llvm_rc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4525
 2020-03-27 07:39:29 -04:00
Brad King
5a79394e96 Merge branch 'release-3.17' 2020-03-27 07:38:23 -04:00
Brad King
032df7ae7b Merge topic 'llvm-rc-depfile' into release-3.17 
2c724c3aea llvm-rc: Write depfile to location specified by the generator
4cc876540e llvm-rc: Select preprocessor from active languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4524
 2020-03-27 07:38:22 -04:00
Brad King
ab96bbff2c Merge topic 'llvm-rc-depfile' 
2c724c3aea llvm-rc: Write depfile to location specified by the generator
4cc876540e llvm-rc: Select preprocessor from active languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4524
 2020-03-27 07:38:22 -04:00
Brad King
a0b1463c26 Merge branch 'release-3.16' 2020-03-27 07:36:35 -04:00
Brad King
0af3a9b755 Merge topic 'make-nested-silent' into release-3.17 
d6d9da5178 Makefiles: Fix silencing of nested calls for GNU make 4.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4515
 2020-03-27 07:35:12 -04:00
Brad King
731b3903d4 Merge branch 'release-3.17' 2020-03-27 07:35:12 -04:00
Brad King
610759fa3e Merge topic 'make-nested-silent' 
d6d9da5178 Makefiles: Fix silencing of nested calls for GNU make 4.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4515
 2020-03-27 07:35:12 -04:00
Kitware Robot
b83696c04c CMake Nightly Date Stamp 2020-03-27 00:01:09 -04:00
Brad King
3503a79639 Merge branch 'backport-ctest-timeout-report' into ctest-timeout-report 2020-03-26 14:42:17 -04:00
Brad King
7fda917fa4 CTest: Fix reported duration on timeout when grindchild keeps pipes open 
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
 2020-03-26 14:35:54 -04:00
Marc Chevrier
63580668a8 FindPython: fix variable spelling error 2020-03-26 18:08:25 +01:00
Brad King
4b8297721f CheckIPOSupported: Avoid polluting cache with common name 'result' 
Fixes: #20508
 2020-03-26 12:57:07 -04:00
Brad King
e6344586ee install: Document caveat when EXPORT name matches package name 
Fixes: #20427
 2020-03-26 09:34:23 -04:00
Cristian Adam
2ce08e5489 PCH: add an option to disable -Winvalid-pch 
Fixes: #20295
 2020-03-26 14:24:46 +01:00
Brad King
4b266927c7 Merge topic 'cleanup-endls-3' 
8e3a65d963 Refactor: Avoid `std::endl` where it's not necessary (part 3)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4517
 2020-03-26 09:19:31 -04:00
Brad King
6a0c1726e0 Merge topic 'cleanup-endls-2' 
1e4b5c7d09 Refactor: Avoid `std::endl` where it's not necessary (part 2)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4514
 2020-03-26 09:18:25 -04:00
Brad King
577fc3ef19 Merge topic 'string-prefix' 
ec7928ef26 use _s to construct static string_views at several places
94de927cab VS10Generator: avoid many string allocations
8ca2504a4d use string_views to avoid memory allocations
761f1adcae check for a valid URL scheme before starting to do any splitting
ef778d77e0 replace std::string::substr() with operations that do not allocate memory
77616f4681 pass cm::string_view to cmVisualStudioSlnParser::ParseTag()
ada6a3226f use cm::string_view for language extension lookups
48adc29721 replace "std::string::find(x) == 0" with cmHasPrefix()
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4501
 2020-03-26 09:15:41 -04:00
Brad King
607e790f4b Merge topic 'update-kwsys' 
5f8d1668a2 Merge branch 'upstream-KWSys' into update-kwsys
9d3b9ec4ab KWSys 2020-03-25 (4380f1ae)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4509
 2020-03-26 09:14:41 -04:00
Brad King
6257d43ffd Merge topic 'compile-commands-collapse-whitespace' 
e565053bce Ninja: Remove unnecessary newlines in compile commands
5d4bab500e Avoid consecutive whitespace in rules
d8622fbd0f Modules: Collapse consecutive whitespace in strings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4512
 2020-03-26 09:13:45 -04:00
Brad King
4e74a59ab5 Merge topic 'cleanup-CollapseFullPath-calls' 
25f48761fa Simplify absolute path conversions using CollapseFullPath full signature
12b39aef75 Remove redundant calls to CollapseFullPath

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4518
 2020-03-26 09:11:47 -04:00
Brad King
545875bebe Merge topic 'mingw-windres-cross-compile' 
af4adf6aa9 MinGW: Fix default windres selection when cross-compiling
0251ddadab MinGW: Drop unnecessary windres selection code with Unix Makefiles

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4520
 2020-03-26 09:06:13 -04:00
Brad King
6c7e6b1e49 Ninja Multi-Config: Fix MSVC showincludes prefix detection 
Activate the detection logic for this generator too.

Fixes: #20506
 2020-03-26 08:47:36 -04:00
Marc Chevrier
0cd20e8f62 export(): raise an error on multiple calls with same FILE 
Fixes: 20472
 2020-03-26 13:20:45 +01:00
Brad King
f3d7a15010 VS: Fix ClangCL toolset compiler path detection 
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
 2020-03-26 08:18:25 -04:00
Thomas Bernard
dc93cbb0d8 llvm-rc: Print stderr output when calling tools through cmake_llvm_rc 
The stored error pipe is output if the program fails.

Fixes: #20494
 2020-03-26 07:59:55 -04:00
Brad King
6fdf05db7a Merge branch 'make-nested-silent' into release-3.16 
Merge-request: !4515
 2020-03-26 07:37:06 -04:00