mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-28 18:09:31 -06:00
Code Issues Packages Projects Releases Wiki Activity
54,568 Commits 2 Branches 390 Tags
f5445e321e29f348b4d72dce5bb7bf10a290b844
Commit Graph

31336 Commits

Author SHA1 Message Date
Brad King
f5445e321e Merge topic 'enh-CPack-SetOption-accepts-new-types' 
7fce78982b Use new SetOption signatures
7aeb262278 cmCPackGenerator::SetOption accepts cmProp or std::string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6526
 2021-09-16 08:22:06 -04:00
Brad King
9858381ba8 Merge topic 'enh-CTest-SetOption-accepts-new-types' 
8f52451682 Use new SetOption signatures
8d0ae460de cmCTestGenericHandler::SetOption accepts cmProp or std::string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6525
 2021-09-16 08:20:30 -04:00
Brad King
98f78af88b Merge topic 'update-curl' 
412189bce7 curl: Set build options the way we need for CMake
8ecd95845c Merge branch 'upstream-curl' into update-curl
386467c9dc curl 2021-09-14 (8e82f2a0)
a8ae9c7055 curl: Update script to get curl 7.79.0
3cfd89add5 cmCurl: Fix file:// URLs with spaces for curl 7.78+
63b5a6869e cmCurl: Adopt helper to fix file:// URLs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6523
 2021-09-16 08:19:37 -04:00
Brad King
1b91aaecd8 Merge topic 'vs2022' 
b6ac10394b VS: Update Visual Studio 17 2022 generator for Preview 4
f200f4d5a7 VS: Fix managed C++ project generation for VS 2022

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6524
 2021-09-16 08:16:54 -04:00
Brad King
86d0d78f2e Merge topic 'msvc-pch-obj-restriction' 
3b9e04accb PCH: MSVC: Restrict OBJECT library INTERFACE_LINK_LIBRARIES usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6518
 2021-09-16 08:15:31 -04:00
Kitware Robot
038c416f93 CMake Nightly Date Stamp 2021-09-16 00:01:13 -04:00
Brad King
3cfd89add5 cmCurl: Fix file:// URLs with spaces for curl 7.78+ 
Since curl 7.78, URLs with spaces that are not encoded as `%20` or `+`
are now correctly rejected with `CURLUE_MALFORMED_INPUT`.  However,
CMake has long accepted `file://` URLs with spaces in the path due to
curl 7.77 and below accidentally allowing them.  Preserve this by
explicitly encoding spaces in such URLs before handing them to curl.

See also upstream curl commit `b67d3ba73` (curl_url_set: reject spaces
in URLs w/o CURLU_ALLOW_SPACE, 2021-05-31, curl-7_78_0~133).
 2021-09-15 15:28:01 -04:00
Brad King
63b5a6869e cmCurl: Adopt helper to fix file:// URLs 
Migrate and generalize the helper added by commit e63dcb1378 (Encoding:
Use encoding libcurl expects with file: urls., 2014-11-05,
v3.2.0-rc1~420^2).
 2021-09-15 15:03:22 -04:00
Brad King
f200f4d5a7 VS: Fix managed C++ project generation for VS 2022 
VS 2022 expects managed `.vcxproj` files to have a `ManagedAssembly`
element.

Fixes: #22583
 2021-09-15 13:19:37 -04:00
Marc Chevrier
7fce78982b Use new SetOption signatures 2021-09-15 18:30:49 +02:00
Marc Chevrier
7aeb262278 cmCPackGenerator::SetOption accepts cmProp or std::string 2021-09-15 18:30:41 +02:00
Marc Chevrier
8f52451682 Use new SetOption signatures 2021-09-15 18:08:19 +02:00
Marc Chevrier
8d0ae460de cmCTestGenericHandler::SetOption accepts cmProp or std::string 2021-09-15 18:08:19 +02:00
Cristian Adam
3b9e04accb PCH: MSVC: Restrict OBJECT library INTERFACE_LINK_LIBRARIES usage 
The pch object file could cause problems when the reused pch is passed
through an OBJECT library, which would use INTERFACE_LINK_LIBRARIES to
link the pch object file.

Fixes: #22630
 2021-09-15 10:39:46 -04:00
Brad King
49fb755302 Merge topic 'cmProp-explicit-string_view-cast-operator' 
79362cf117 cmProp: cm::string_view cast operator must be explicit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6515
 2021-09-15 10:16:41 -04:00
Kitware Robot
c2c1c701c7 CMake Nightly Date Stamp 2021-09-15 00:01:22 -04:00
Marc Chevrier
79362cf117 cmProp: cm::string_view cast operator must be explicit 
To avoid ambiguity on std::string assigment between the following two
cmProp cast operators:
* operator const std::string&() const noexcept
* operator cm::string_view() const noexcept
 2021-09-14 17:42:02 +02:00
Brad King
69c0a5daf9 Merge topic 'pch-xcode-multiple-languages' 
bbcdac4e5d PCH: Fix all-language precompile header support in Xcode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6435
 2021-09-14 09:48:00 -04:00
Brad King
67b3c27192 Merge topic 'refactor-CPack-GetOption-returns-cmProp' 
202a65759b cmCPackGenerator::GetOption returns cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6506
 2021-09-14 09:40:19 -04:00
Brad King
0a84ba8590 Merge topic 'refactor-CTest-GetOption-returns-cmProp' 
f9bcde974e cmCTestGenericHandler::GetOption returns cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6505
 2021-09-14 09:39:09 -04:00
Brad King
085719d4d8 Merge topic 'iwyu-cl' 
ccfe1b0b40 IWYU: Add `--driver-mode=cl` when applicable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6511
 2021-09-14 09:36:13 -04:00
Brad King
2a8d9bf4cc Merge topic 'CMakeDependentOption-condition-syntax' 
059b90a0b4 CMakeDependentOption: Introduce policy CMP0127 for full Condition Syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6493
 2021-09-14 09:35:07 -04:00
Kitware Robot
de1c6c0bc5 CMake Nightly Date Stamp 2021-09-14 00:01:11 -04:00
Cristian Adam
bbcdac4e5d PCH: Fix all-language precompile header support in Xcode 
Fixes: #22384
 2021-09-13 08:12:11 -07:00
Marc Chevrier
202a65759b cmCPackGenerator::GetOption returns cmProp 2021-09-13 09:54:27 -04:00
Marc Chevrier
f9bcde974e cmCTestGenericHandler::GetOption returns cmProp 2021-09-13 11:29:07 +02:00
Kitware Robot
253f31f5ef CMake Nightly Date Stamp 2021-09-13 00:01:21 -04:00
Kitware Robot
b7bcf70761 CMake Nightly Date Stamp 2021-09-12 00:01:13 -04:00
Kitware Robot
00a2dc4d2f CMake Nightly Date Stamp 2021-09-11 00:01:17 -04:00
PigeonF
ccfe1b0b40 IWYU: Add --driver-mode=cl when applicable 
We already do this for `clang-tidy`.

Fixes: #16554
 2021-09-10 09:53:31 -04:00
Marc Chevrier
9488f8a7b7 Merge topic 'enh-AddCacheEntry-accepts-new-types' 
f84193292c Use new AddCacheEntry signatures
3c2e58eeb8 AddCacheEntry accept cmProp or std::string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6495
 2021-09-10 09:47:39 -04:00
Daniel Schürmann
059b90a0b4 CMakeDependentOption: Introduce policy CMP0127 for full Condition Syntax 
Fixes: #22303
 2021-09-10 09:46:55 -04:00
Marc Chevrier
f84193292c Use new AddCacheEntry signatures 2021-09-10 15:46:21 +02:00
Marc Chevrier
3c2e58eeb8 AddCacheEntry accept cmProp or std::string 2021-09-10 15:45:51 +02:00
Brad King
293070c325 Merge topic 'vs_settings' 
f21158cdfe VS: Honor VS_SETTINGS source file property on all sources
3bf013632d cmVisualStudio10TargetGenerator: Factor out helper to write VS_SETTINGS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6492
 2021-09-10 09:34:17 -04:00
Brad King
595502c039 Merge topic 'vs-csproj-scripts' 
b284a21fee VS: Add missing label in C# project-build events

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6485
 2021-09-10 09:33:23 -04:00
Brad King
a4fccf74af Merge topic 'ctest-memcheck-generate-test.xml' 
ce44c2cec3 ctest_memcheck: generate `DynamicAnalysis-Test.xml` as well

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6491
 2021-09-10 09:29:42 -04:00
Brad King
118a0adf5b Merge topic 'ninja-rc' 
fa2f6e0f5a cmNinjaTargetGenerator: Use short path for cmcldeps.exe

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6502
 2021-09-10 09:28:39 -04:00
Kitware Robot
0627020bae CMake Nightly Date Stamp 2021-09-10 00:01:15 -04:00
Steven Boswell
b284a21fee VS: Add missing label in C# project-build events 
Fixes: #21440
 2021-09-09 14:22:26 -04:00
Steven Boswell
f21158cdfe VS: Honor VS_SETTINGS source file property on all sources 
Extend the feature added by commit 2ce42f281f (VS: Add VS_SETTINGS
source file property, 2020-03-18, v3.18.0-rc1~449^2~3) to support
all source file types.
 2021-09-09 14:19:28 -04:00
Steven Boswell
3bf013632d cmVisualStudio10TargetGenerator: Factor out helper to write VS_SETTINGS 2021-09-09 14:19:28 -04:00
Brad King
ed9abd9977 Merge topic 'mocmacrosonce' 
8ff0c2b1dd AutoMoc: Do not list moc macros multiple times
6e2f4029c0 cmAlgorithms: Preserve const-ness in cmRemoveDuplicates range signature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6459
 2021-09-09 14:02:52 -04:00
Brad King
111f818b54 Merge topic 'refactor-string-backtrace-vectors' 
ab94c369c9 Refactor: Convert parallel string/backtrace vectors to BT vectors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6486
 2021-09-09 13:23:56 -04:00
Brad King
d2a5fef985 Merge topic 'update-kwsys' into release-3.21 
115152ce10 KWSys: SystemTools: Ensure Windows Vista APIs are available before using them

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6500
 2021-09-09 13:19:53 -04:00
Brad King
37fce84e5b Merge topic 'update-kwsys' 
5cb8516bec Merge branch 'backport-kwsys' into update-kwsys
8e16c9ed1c Merge branch 'upstream-KWSys' into update-kwsys
00ccc0f47c KWSys 2021-09-03 (0da908d4)
115152ce10 KWSys: SystemTools: Ensure Windows Vista APIs are available before using them

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6500
 2021-09-09 13:19:53 -04:00
Kitware Robot
ce6820fe21 CMake Nightly Date Stamp 2021-09-09 00:01:11 -04:00
Ben Boeckel
ce44c2cec3 ctest_memcheck: generate DynamicAnalysis-Test.xml as well 
This is useful so that memcheck results also show up as test results on
CDash. It will be submitted with the other `MemCheck` parts.

Fixes: #22190
 2021-09-08 21:04:46 -04:00
Kitware Robot
cf5ed70991 CMake Nightly Date Stamp 2021-09-08 00:01:19 -04:00
Kitware Robot
51e7a78b0b CMake Nightly Date Stamp 2021-09-07 00:01:13 -04:00