mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-20 21:28:23 -05:00
Code Issues Packages Projects Releases Wiki Activity
47,472 Commits 2 Branches 399 Tags
be154ea1e3efcd1a13952701337378a01ca0cd19
Commit Graph

28590 Commits

Author SHA1 Message Date
Kitware Robot be154ea1e3 CMake Nightly Date Stamp 2020-03-31 00:01:10 -04:00
Brad King 888b8a43d8 Merge topic 'cmprop-state' 
a4255ecf81 cmStateDirectory::GetProperty: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4536
 2020-03-30 13:30:48 -04:00
Brad King ad22d0c1d0 Merge topic 'vs-non-built-file-item-metadata' 
0723e04f7a VS: Add documentation for VS_SETTINGS and VS_SOURCE_SETTINGS_<tool>.
2ca1102f83 VS: Test VS_SETTINGS and VS_SOURCE_SETTINGS_<tool> properties.
f00e1b816d VS: Add VS_SOURCE_SETTINGS_<tool> target property
2ce42f281f VS: Add VS_SETTINGS source file property
53116d3942 VS: Use unordered_map to write HLSL settings.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4498
 2020-03-30 13:28:19 -04:00
Kitware Robot 887eb6b768 CMake Nightly Date Stamp 2020-03-30 00:01:13 -04:00
Kitware Robot 371727cd58 CMake Nightly Date Stamp 2020-03-29 00:01:22 -04:00
Kitware Robot cc86c9279e CMake Nightly Date Stamp 2020-03-28 00:01:13 -04:00
Vitaly Stakhovsky a4255ecf81 cmStateDirectory::GetProperty: return cmProp 2020-03-27 12:33:04 -04:00
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 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 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 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 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
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
Marc Chevrier 0cd20e8f62 export(): raise an error on multiple calls with same FILE 
Fixes: 20472
 2020-03-26 13:20:45 +01: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 d6d9da5178 Makefiles: Fix silencing of nested calls for GNU make 4.3 
Since GNU make 4.3, `.SILENT:` no longer causes nested `$(MAKE)` calls
to get `-s` implicitly.  Add the `-s` flag explicitly on such calls to
suppress messages about Entering/Leaving directories.

Fixes: #20487
 2020-03-26 07:34:24 -04:00
Kitware Robot 66e0b312c0 CMake Nightly Date Stamp 2020-03-26 00:01:10 -04:00
Alex Turbov 3fdd8db3aa Refactor: Avoid std::endl where it's not necessary (part 1) 
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.
 2020-03-26 11:36:57 +08:00
Vitaly Stakhovsky a7f2ff16a4 cmState::GetCacheEntryProperty: return cmProp 2020-03-25 14:46:52 -04:00
Brad King ea54f8d441 Merge topic 'cmake-compilation-no-compiler-extensions' 
f034b0f663 CMake compilation: do not use compiler extensions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4477
 2020-03-25 10:34:40 -04:00
Brad King 952fbd9ee5 Merge topic 'cmprop-state' 
ef408dd232 cmState::GetTargetTypeName: return type is *cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4505
 2020-03-25 09:25:26 -04:00
Vitaly Stakhovsky c84cf42897 cmState::GetGlobalProperty: return cmProp 2020-03-25 09:10:46 -04:00
Brad King d13d5c11cf Merge topic 'cmprop-cache' 
0bf0e35e59 cmCacheManager::GetProperty: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4503
 2020-03-25 08:39:26 -04:00
Brad King 5f8d1668a2 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-03-25 (4380f1ae)
 2020-03-25 07:47:51 -04:00
Kitware Robot 69e495d10a CMake Nightly Date Stamp 2020-03-25 00:01:07 -04:00
Rolf Eike Beer ec7928ef26 use _s to construct static string_views at several places 
This should avoid the runtime strlen() call.
 2020-03-24 19:40:44 +01:00
Rolf Eike Beer 94de927cab VS10Generator: avoid many string allocations 2020-03-24 17:50:42 +01:00
Rolf Eike Beer 8ca2504a4d use string_views to avoid memory allocations 2020-03-24 17:50:37 +01:00
Brad King 25f48761fa Simplify absolute path conversions using CollapseFullPath full signature 2020-03-24 10:10:06 -04:00
Brad King 12b39aef75 Remove redundant calls to CollapseFullPath 
Remove calls where it is known the input is already a collapsed
full path.
 2020-03-24 10:10:06 -04:00
Alex Turbov 8e3a65d963 Refactor: Avoid std::endl where it's not necessary (part 3) 
The `std::endl` manipulator, except inserting `\n` character, also
performs `os.flush()`, which may lead to undesired effects (like
disk I/O in the middle of forming data strings). For the
`std::stringstream` it also has no meaning.

* replace multiple `operator<<` calls on a string literal w/
  the only call and the only (bigger) string literal;
* replace one character string literal used in `operator<<`
  w/ a char literal.
 2020-03-24 21:33:33 +08:00
Alex Turbov 1e4b5c7d09 Refactor: Avoid std::endl where it's not necessary (part 2) 
The `std::endl` manipulator, except inserting `\n` character, also
performs `os.flush()`, which may lead to undesired effects (like
disk I/O in the middle of forming data strings). For the
`std::stringstream` it also has no meaning.

* replace multiple `operator<<` calls on a string literal w/
  the only call and the only (bigger) string literal;
* replace one character string literal used in `operator<<`
  w/ a char literal.
 2020-03-24 21:32:05 +08:00
Kitware Robot c98ec3692e CMake Nightly Date Stamp 2020-03-24 00:01:07 -04:00
Rolf Eike Beer 761f1adcae check for a valid URL scheme before starting to do any splitting 2020-03-23 22:41:44 +01:00
Rolf Eike Beer ef778d77e0 replace std::string::substr() with operations that do not allocate memory 
Modify the original string instead of creating a new copy with substr() when it
is not used for anything else afterwards.
 2020-03-23 22:41:44 +01:00
Rolf Eike Beer 77616f4681 pass cm::string_view to cmVisualStudioSlnParser::ParseTag() 2020-03-23 22:41:43 +01:00
Rolf Eike Beer ada6a3226f use cm::string_view for language extension lookups 
Once the list of extensions is build the set is just a copy of the vector and
not modified anymore. Use a string_view for the members of the set, which saves
a small amount of memory. It also makes possible to use string_views as lookup
keys, so the callers do not need to create copies for the extensions anymore.
 2020-03-23 22:41:43 +01:00
Rolf Eike Beer 48adc29721 replace "std::string::find(x) == 0" with cmHasPrefix() 2020-03-23 22:41:43 +01:00