mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 22:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity
47,543 Commits 2 Branches 385 Tags
56cccde235cbe24df7c108fd475fddfd84869d93
Commit Graph

28613 Commits

Author SHA1 Message Date
Brad King
56cccde235 cmWorkingDirectory: Add GetOldDirectory method 2020-04-03 09:55:49 -04:00
Brad King
753817e71d CPack/FreeBSD: Use RAII to save/restore working directory 2020-04-03 09:55:49 -04:00
Brad King
f4e4b41a19 Merge topic 'pch-ios-multi-arch' 
f593b354da PCH: Add support for multi architecture iOS projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4561
 2020-04-03 07:05:11 -04:00
Kitware Robot
b44624e0ca CMake Nightly Date Stamp 2020-04-03 00:01:11 -04:00
Cristian Adam
f593b354da PCH: Add support for multi architecture iOS projects 
Fixes: #20497
 2020-04-02 11:51:19 -04:00
Brad King
e95d274f30 Merge topic 'cmprop-makefile' 
aba23c747b cmMakefile::GetProperty: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4559
 2020-04-02 11:20:46 -04:00
Brad King
525bd2d5e6 Merge topic 'config-case' 
ff02a592bc cmLocalGenerator: Avoid using upper-case config when not necessary
a4b76c237d cmLocalGenerator: Clarify local variable name in GetTargetFlags
25a920e827 cmLocalGenerator: Convert GetStaticLibraryFlags to take original-case config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4558
 2020-04-02 11:20:05 -04:00
Brad King
e7f58eff27 Merge topic 'cuda_check' 
e758331595 cm_cxx_features: Remove CUDA installation warning filtering

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4554
 2020-04-02 11:15:44 -04:00
Brad King
3667366171 Merge topic 'update-kwsys' 
afe8a5eb3f Merge branch 'upstream-KWSys' into update-kwsys
976d29b9bd KWSys 2020-04-01 (25694819)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4556
 2020-04-02 11:14:46 -04:00
Kitware Robot
af138785e2 CMake Nightly Date Stamp 2020-04-02 00:01:11 -04:00
Vitaly Stakhovsky
aba23c747b cmMakefile::GetProperty: return cmProp 2020-04-01 10:56:34 -04:00
Brad King
ff02a592bc cmLocalGenerator: Avoid using upper-case config when not necessary 
Calls to `GetLinkerLanguage`, `GetSourceFiles`, etc. can accept
the original-case config name.
 2020-04-01 10:56:00 -04:00
Brad King
a4b76c237d cmLocalGenerator: Clarify local variable name in GetTargetFlags 2020-04-01 10:55:59 -04:00
Brad King
25a920e827 cmLocalGenerator: Convert GetStaticLibraryFlags to take original-case config 
Move upper-case conversion of the configuration into the implementation.
 2020-04-01 10:55:59 -04:00
Brad King
221b046ad3 Merge topic 'cmprop-target' 
3eec21a01c cmTarget::GetProperty: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4546
 2020-04-01 10:52:39 -04:00
Brad King
4e69c9d8d8 Merge topic 'cpack-nsis-version' 
aa78a2537c CPack/NSIS: Document and check requirement of at least NSIS 3.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4552
 2020-04-01 10:43:25 -04:00
Brad King
afe8a5eb3f Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-04-01 (25694819)
 2020-04-01 10:15:00 -04:00
Raul Tambre
e758331595 cm_cxx_features: Remove CUDA installation warning filtering 
This has been fixed in upstream LLVM. No released version contains this issue.
d32170dbd5
eb2ba2ea95
 2020-04-01 10:34:35 +03:00
Kitware Robot
f30526c04a CMake Nightly Date Stamp 2020-04-01 00:01:10 -04:00
Brad King
aa78a2537c CPack/NSIS: Document and check requirement of at least NSIS 3.0 
Since commit 9d2816544e (CPack/NSIS: Also preload the "UserInfo.dll"
plugin, 2020-01-04, v3.17.0-rc1~204^2) we require NSIS 3.0.  Since
older versions do not support Windows 8 or above, we can now require
at least version 3.0.

Fixes: #20514
 2020-03-31 10:57:28 -04:00
Brad King
16053df54e Merge topic 'link-libs-config-case' 
2af18704fd Merge branch 'backport-3.16-link-libs-config-case'
3f976bf201 target_link_libraries: Fix regression in case of $<CONFIG> genex
5a95b5e091 target_link_libraries: Fix regression in case of $<CONFIG> genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4544
 2020-03-31 09:19:42 -04:00
Kitware Robot
be154ea1e3 CMake Nightly Date Stamp 2020-03-31 00:01:10 -04:00
Vitaly Stakhovsky
3eec21a01c cmTarget::GetProperty: return cmProp 2020-03-30 15:00:14 -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
Brad King
3f976bf201 target_link_libraries: Fix regression in case of $<CONFIG> genex 
Since commit b8626261e9 (Precompile headers: Add methods to generate PCH
sources, 2019-07-13, v3.16.0-rc1~182^2~4) we look up source files for a
target using an upper-case configuration even though an original-case
name is sufficient.  Since commit 36ded610af (PCH: Generate sources
during Compute step, 2019-10-05, v3.16.0-rc1~2^2) the source file lookup
is the first time we compute many on-demand structures that depend on
the configuration name.  This caused the `$<CONFIG>` generator
expression to evaluate to the upper-case configuration name in some
cases where we used original-case before.

Fix this by switching the source file lookup to the original-case config
name.  Add a test covering the symptom that led to the discovery of this
problem.

Fixes: #20517
 2020-03-30 11:33:55 -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