mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-13 12:59:55 -05:00
Code Issues Packages Projects Releases Wiki Activity
47,415 Commits 2 Branches 393 Tags
9a585fc038aae22b3afa5d9e9051fe768cce9ec6
Commit Graph

47415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Thomas Bernard
2c724c3aea llvm-rc: Write depfile to location specified by the generator 
Move the depfile flags to `CMAKE_DEPFILE_FLAGS_RC` so that they
are only usedwith generators that use depfiles.  Also switch to
using the `<DEPFILE>` placeholder for the location of the depfile
so that it goes where the generator expects.

Fixes: #20493
 2020-03-26 07:26:21 -04:00
Thomas Bernard
4cc876540e llvm-rc: Select preprocessor from active languages 
The llvm-rc preprocessor is selected according to the
CMAKE_C_COMPILER_ID / CMAKE_CXX_COMPILER_ID which are only defined when
the C or CXX language is active.
 2020-03-26 07:25:33 -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