mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-18 13:10:17 -06:00
Code Issues Packages Projects Releases Wiki Activity
47,383 Commits 2 Branches 390 Tags
577fc3ef1942fd11791a4b6cd557b6da32daa5d6
Commit Graph

47383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kitware Robot
66e0b312c0 CMake Nightly Date Stamp 2020-03-26 00:01:10 -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
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
79415fa6d3 Merge topic 'FindRuby-rvm' 
905d5667e8 FindRuby: Add support for RVM installations
e6699b9b59 FindRuby: Validate Ruby_EXECUTABLE before accepting it

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4386
 2020-03-25 08:16:38 -04:00
Brad King
3202980a1e Merge branch 'release-3.17' 2020-03-25 08:13:07 -04:00
Brad King
f2b4576373 Merge topic 'FindPython-polish' 
bf1ecfef7f FindPython: misc. fixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4519
 2020-03-25 08:13:07 -04:00
Brad King
d14626afe5 Merge topic 'FindPython-polish' into release-3.17 
bf1ecfef7f FindPython: misc. fixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4519
 2020-03-25 08:13:06 -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
KWSys Upstream
9d3b9ec4ab KWSys 2020-03-25 (4380f1ae) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 4380f1ae99f3206938251393e94055a3e4120b2c (master).

Upstream Shortlog
-----------------

Rolf Eike Beer (6):
      25b61c12 Directory: make it move constructible and assignable
      8b1a29e1 optimize SystemToolsParseRegistryKey()
      420c3b04 call std::string::clear() instead of assigning ""
      bc9a4256 avoid inefficient usage of std::string::substr()
      e3c051e2 SystemTools: create directories with the right permissions on Un*x
      0085096e avoid std::string::find() to check for prefix
 2020-03-25 07:47:51 -04:00
Brad King
af4adf6aa9 MinGW: Fix default windres selection when cross-compiling 
When cross-compiling to MinGW, select the `windres` tool named with the
toolchain's prefix.

Fixes: #20500
 2020-03-25 07:21:01 -04:00
Brad King
0251ddadab MinGW: Drop unnecessary windres selection code with Unix Makefiles 
Since commit 957c2aac7f (RC: Simplify selection of resource compiler
based on C/C++ toolchain, 2015-05-07, v3.3.0-rc1~93^2~5) we select
windres as the RC compiler on MinGW via `CMAKE_RC_COMPILER_INIT`.  Drop
the special case from commit be9afbf453 (Find mingw's windres also when
Unix Makefiles are used, 2012-08-27, v2.8.10~152^2).
 2020-03-25 07:21:01 -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
Marc Chevrier
bf1ecfef7f FindPython: misc. fixes 
Help: Fix errors regardings HINTS.
Code: Optimize Python signature cache variable to avoid unecessary searchs.
 2020-03-24 18:26:16 +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
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
Daan De Meyer
e565053bce Ninja: Remove unnecessary newlines in compile commands 2020-03-23 21:34:19 +01:00
Daan De Meyer
5d4bab500e Avoid consecutive whitespace in rules 2020-03-23 21:34:19 +01:00
Daan De Meyer
d8622fbd0f Modules: Collapse consecutive whitespace in strings 2020-03-23 21:34:17 +01:00
Rolf Eike Beer
bfb69f9543 replace "substr(0, xx) ==" with cmHasPrefix() 2020-03-23 20:19:26 +01:00
Rolf Eike Beer
7df84ffe58 allow cmCTest::CleanString() to skip input characters 
This entirely avoids that one needs to call std::string::substr() for the
input.
 2020-03-23 20:19:26 +01:00
Rolf Eike Beer
d6a4e9fbc8 CTest: avoid repeated string compares 
Only one key can match per iteration, avoid any further compares when one match
was already found. While at it entirely avoid that the key and value strings are
copied.
 2020-03-23 20:18:02 +01:00
Rolf Eike Beer
d1e6ee6fe3 Mumps coverage: directly pass std::string as argument 2020-03-23 19:47:47 +01:00
Rolf Eike Beer
dc21177461 remove pointless return value from cmCTestTestHandler::CleanTestOutput() 2020-03-23 19:47:47 +01:00
Rolf Eike Beer
36bfb80338 PyCoverage: avoid repeated string splitting, especially for uncovered lines 2020-03-23 19:47:47 +01:00
Rolf Eike Beer
0415fa3be7 use std::string::rfind() instead of open coding it 
While at it avoid creating a new string.
 2020-03-23 19:47:47 +01:00
Rolf Eike Beer
871bf0cc88 CPackWIXGenerator: use cmStrCat for more parts 2020-03-23 19:47:46 +01:00
Rolf Eike Beer
d6cf89c0d4 remove needless check for std::string::substr() 
Passing npos is legal and means "rest of the string".
 2020-03-23 19:47:46 +01:00
Rolf Eike Beer
a42d2b099a cmcldeps: replace inefficient std::string::substr usage 2020-03-23 19:47:46 +01:00
Rolf Eike Beer
59d572bb4a replace private startsWith() implementation with cmHasPrefix() 2020-03-23 19:47:46 +01:00
Brad King
206a65c3b8 Merge branch 'release-3.17' 2020-03-23 10:54:42 -04:00
Brad King
1d9884fe7d Merge topic 'doc-typo' 
356c7cec2c Help: Fixed typo in CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4516
 2020-03-23 10:54:42 -04:00
Brad King
c1ad4a74d4 Merge topic 'doc-typo' into release-3.17 
356c7cec2c Help: Fixed typo in CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4516
 2020-03-23 10:54:41 -04:00
Jaak Ristioja
356c7cec2c Help: Fixed typo in CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst 
Signed-off-by: Jaak Ristioja <jaak@ristioja.ee>
 2020-03-23 09:46:08 -04:00
Brad King
aef934ff63 Merge branch 'release-3.17' 2020-03-23 09:27:44 -04:00
Brad King
a4abf61520 Merge topic 'cmake-gui-open-check' 
ecc0086bfc cmake-gui: Fix use-after-free in Open-possible check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4508
 2020-03-23 09:27:44 -04:00