mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 20:00:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
54,536 Commits 2 Branches 401 Tags
fdeb9e075188b15ffc136cffe435002a28f422f8
Commit Graph

54536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King fdeb9e0751 Merge topic 'GNUInstallDirs_become_conda_install_aware' 
ecaca8c129 GNUInstallDirs now aware of conda lib directory requirements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Silvio Traversaro <pegua1@gmail.com>
Merge-request: !6512
 2021-09-14 09:41:19 -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 03124e4d4c Merge topic 'update-jsoncpp' 
ffc6be33a7 IWYU: Map jsoncpp internal header to its public header
d7dfb84f89 Merge branch 'upstream-jsoncpp' into update-jsoncpp
0b97650518 jsoncpp 2020-09-25 (9059f5ca)
d9f8e39357 jsoncpp: Update script to get jsoncpp 1.9.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6514
 2021-09-14 09:37:49 -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
Brad King 036f41e45f Merge topic 'CMakeFindPackageMode-sysroot' 
8defe3380e CMakeFindPackageMode: Honor CMAKE_SYSROOT to detect lib64 platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6513
 2021-09-14 09:33:55 -04:00
Kitware Robot de1c6c0bc5 CMake Nightly Date Stamp 2021-09-14 00:01:11 -04:00
Marc Chevrier 202a65759b cmCPackGenerator::GetOption returns cmProp 2021-09-13 09:54:27 -04:00
Robert Maynard ecaca8c129 GNUInstallDirs now aware of conda lib directory requirements 
No matter the OS when installing for conda the library components
need to be placed into the `lib` directory.

To better meet these requirements GNUInstallDirs now checks to see
if it is being asked to install into a conda install location,
and if so use the 'lib' directory instead of the system directory
name.
 2021-09-13 08:42:40 -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
Craig Scott dadb7a2ba5 Merge topic 'document_find_package_version_restrictions' 
563139e5e9 Help: find_package document version only supports numeric components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6510
 2021-09-11 04:39:10 -04:00
Kitware Robot 00a2dc4d2f CMake Nightly Date Stamp 2021-09-11 00:01:17 -04:00
Brad King ffc6be33a7 IWYU: Map jsoncpp internal header to its public header 2021-09-10 11:05:01 -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 72c4f1281e Merge topic 'icu-advanced' 
cdd2714dfa FindICU: Really mark variables as advanced

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6507
 2021-09-10 09:32:26 -04:00
Brad King c8605bfd45 Merge topic 'clang_msvc_frontend_detection_for_asm' 
c9c79dde41 Clang: Add MSVC frontend detection for the ASM compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6481
 2021-09-10 09:31:00 -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
Marc Chevrier dc971e7da4 Merge topic 'thread-typos' 
d897391782 Fix typo in comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Arcturus <arcturus102@outlook.com>
Merge-request: !6504
 2021-09-10 04:34:09 -04:00
Kitware Robot 0627020bae CMake Nightly Date Stamp 2021-09-10 00:01:15 -04:00
Brad King d7dfb84f89 Merge branch 'upstream-jsoncpp' into update-jsoncpp 
* upstream-jsoncpp:
  jsoncpp 2020-09-25 (9059f5ca)
 2021-09-09 16:20:13 -04:00
JsonCpp Upstream 0b97650518 jsoncpp 2020-09-25 (9059f5ca) 
Code extracted from:

    https://github.com/open-source-parsers/jsoncpp.git

at commit 9059f5cad030ba11d37818847443a53918c327b1 (1.9.4).
 2021-09-09 16:00:10 -04:00
Brad King d9f8e39357 jsoncpp: Update script to get jsoncpp 1.9.4 2021-09-09 16:00:02 -04:00
Pablo Romero 8defe3380e CMakeFindPackageMode: Honor CMAKE_SYSROOT to detect lib64 platforms 
Add `CMAKE_SYSROOT` to check the full path on host OS. In a
non-crosscompiling use case, the call to `CMAKE_SYSROOT` is empty.

Fixes: #22608
 2021-09-09 15:55:26 -04:00
Robert Maynard 563139e5e9 Help: find_package document version only supports numeric components 2021-09-09 15:02:30 -04:00
Thomas Bernard c9c79dde41 Clang: Add MSVC frontend detection for the ASM compiler 
Fixes: #22495
 2021-09-09 14:26:44 -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 c2686875fb Merge branch 'release-3.21' 2021-09-09 13:19:54 -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
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 759171830b Merge branch 'release-3.21' 2021-09-09 13:17:32 -04:00
Brad King 6ed656680d Merge topic 'ci-msvc-19.29-16.11' 
09c7c0a9c3 gitlab-ci: Update Windows builds to MSVC 19.29-16.11 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6501
 2021-09-09 13:17:32 -04:00
Brad King 0e097776fa Merge topic 'ci-msvc-19.29-16.11' into release-3.21 
09c7c0a9c3 gitlab-ci: Update Windows builds to MSVC 19.29-16.11 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6501
 2021-09-09 13:17:31 -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
Craig Scott ddea20b3dc Merge topic 'mention-qt6-in-AUTOGEN-help' 
84aaebf79f Help: Mention that Qt6 is supported by AUTOGEN

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6508
 2021-09-07 08:26:14 -04:00