mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-20 23:08:34 -05:00
Code Issues Packages Projects Releases Wiki Activity
56,193 Commits 2 Branches 401 Tags
d7ee1145a1d15987e30636a4d2cbee56d0d4f1cd
Commit Graph

56193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot d7ee1145a1 CMake Nightly Date Stamp 2022-02-09 00:01:13 -05:00
Brad King 37e462aaa7 Merge branch 'release-3.23' 2022-02-08 11:23:05 -05:00
Brad King a15cc7706d CMake 3.23.0-rc1 v3.23.0-rc1 2022-02-08 10:43:14 -05:00
Brad King f25f6d2ed9 Merge branch 'release-3.23' 2022-02-08 10:42:18 -05:00
Brad King d831c0873a Merge branch 'release-3.22' 2022-02-08 10:42:16 -05:00
Brad King 0167dc0b1b Merge branch 'release-3.22' into release-3.23 2022-02-08 10:41:59 -05:00
Brad King cd278525ba Merge branch 'release-3.23' 2022-02-08 10:41:18 -05:00
Brad King dc1e84c915 Merge topic 'FindGSL-version-regex' 
b67ff61c3a FindGSL: Improve version extraction regex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6960
 2022-02-08 10:41:18 -05:00
Brad King 46ef6a5555 Merge topic 'FindGSL-version-regex' into release-3.23 
b67ff61c3a FindGSL: Improve version extraction regex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6960
 2022-02-08 10:41:17 -05:00
Brad King b91c4dfb75 Merge branch 'FindGSL-version-regex' into release-3.22 
Merge-request: !6960
 2022-02-08 10:31:16 -05:00
مهدي شينون (Mehdi Chinoune) b67ff61c3a FindGSL: Improve version extraction regex 
Backport commit 58f2708b90 (FindGSL: Improve version extraction regex,
2021-12-17) to the CMake 3.22 branch.

Fixes: #23017
 2022-02-08 10:21:15 -05:00
Brad King 85b7b94efb Merge branch 'release-3.23' 2022-02-08 08:39:35 -05:00
Brad King 6e32db4fb3 Merge topic 'dotnet_sdk' into release-3.23 
5cdd774d51 VS: Handle build target correct for .NET SDK style projects with Any CPU
309191052c VS: Set Visual Studio versions read out from solution file
f7791698cb VS: Allow setting output directory in .NET SDK style projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6944
 2022-02-08 08:39:34 -05:00
Brad King 4bd8a35b55 Merge topic 'dotnet_sdk' 
5cdd774d51 VS: Handle build target correct for .NET SDK style projects with Any CPU
309191052c VS: Set Visual Studio versions read out from solution file
f7791698cb VS: Allow setting output directory in .NET SDK style projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6944
 2022-02-08 08:39:34 -05:00
Brad King 72731dd9dd Merge branch 'release-3.23' 2022-02-08 08:35:20 -05:00
Brad King 8fa592a5f2 Merge topic 'GoogleTest-discover-type-params' 
073dd1bd81 GoogleTest: Change format for typed tests
f28f738bd2 GoogleTest: Fix type param tests for suites with many cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6958
 2022-02-08 08:35:19 -05:00
Brad King 5bf6e57a12 Merge topic 'GoogleTest-discover-type-params' into release-3.23 
073dd1bd81 GoogleTest: Change format for typed tests
f28f738bd2 GoogleTest: Fix type param tests for suites with many cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6958
 2022-02-08 08:35:18 -05:00
Kitware Robot 40c7649a55 CMake Nightly Date Stamp 2022-02-08 00:01:14 -05:00
Evgeniy Shcherbina 073dd1bd81 GoogleTest: Change format for typed tests 
Before it would output a typed test as follows:
  Suit/Type.Case
And now it would be:
  Suit.Case<Type>

In case of NO_PRETTY_TYPES it would simply use the type number
instead of its text representation:
  Suit.Case<0>

The change is introduced to make sure CTest outputs tests in a
similar fashion which is "*Suit.Case*" and angle brackets "<>"
emphasize that we are dealing with a typed (template) kind.
 2022-02-07 12:53:17 -05:00
Evgeniy Shcherbina f28f738bd2 GoogleTest: Fix type param tests for suites with many cases 
When there were many cases (two digits or more) the "prettier" would
fail to recognize the pretty part leaving the test name unprocessed.
The fix made sure the processing would work correctly, irrespective
of the case number.

Before the fix, for the following input:
TypedSuite/1.  # TypeParam = int
  case
TypedSuite/10.  # TypeParam = char
  case
The output would be:
TypedSuite/int.case
TypedSuite/10.  # TypeParam = char.case

Now the output will be:
TypedSuite/int.case
TypedSuite/char.case
 2022-02-07 12:53:16 -05:00
Brad King 6b6d0d12a7 Merge topic 'allow_manifest_as_content' 
feebc8394f Windows: Allow manifest files to be bundled as content

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6939
 2022-02-07 12:19:01 -05:00
Brad King 4cf80f413b Merge topic 'cmcmd-end-of-options-delimiter' 
b10930040d cmcmd: add end of options delimiter to cmake -E commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6934
 2022-02-07 12:18:03 -05:00
Brad King dd6ca78800 Merge branch 'release-3.23' 2022-02-07 11:49:27 -05:00
Brad King 860dbece00 Merge topic 'doc-DESTDIR' into release-3.23 
a9b8c9d33e Help: Clarify roles of DESTDIR and CMAKE_INSTALL_PREFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6955
 2022-02-07 11:49:26 -05:00
Brad King 533760ac29 Merge topic 'doc-DESTDIR' 
a9b8c9d33e Help: Clarify roles of DESTDIR and CMAKE_INSTALL_PREFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6955
 2022-02-07 11:49:26 -05:00
Brad King c308000ca1 Merge topic 'test-ctest_build-subdir-target' 
e485dca1e8 Tests: Move CTest.BuildCommand.ProjectInSubdir into RunCMake.ctest_build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6953
 2022-02-07 11:48:26 -05:00
Brad King e2e9a4b4c9 Merge topic 'test-download-server-timeout' 
8809183d58 Tests: Optionally extend RunCMake.ExternalProject download server timeout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6952
 2022-02-07 11:46:55 -05:00
Florian Schweiger 5cdd774d51 VS: Handle build target correct for .NET SDK style projects with Any CPU 
* Extend Visual Studio solution parser for reading build target
* Map solution build target to project build target (especially for Any CPU)
* Use C++ <optional> template instead of pointer return value for cmSlnData::GetProjectByGUID
 2022-02-07 13:08:37 +01:00
Florian Schweiger 309191052c VS: Set Visual Studio versions read out from solution file 2022-02-07 13:07:40 +01:00
Florian Schweiger f7791698cb VS: Allow setting output directory in .NET SDK style projects 2022-02-07 12:03:03 +01:00
Kitware Robot f93ce447e8 CMake Nightly Date Stamp 2022-02-07 00:01:16 -05:00
Kitware Robot 3d91571f79 CMake Nightly Date Stamp 2022-02-06 00:01:08 -05:00
Kitware Robot db7f754487 CMake Nightly Date Stamp 2022-02-05 00:01:15 -05:00
Brad King a9b8c9d33e Help: Clarify roles of DESTDIR and CMAKE_INSTALL_PREFIX 2022-02-04 15:33:11 -05:00
Brad King e485dca1e8 Tests: Move CTest.BuildCommand.ProjectInSubdir into RunCMake.ctest_build 
The former duplicates code that is now part of the infrastructure in the
latter.  The latter can also explicitly verify the results.
 2022-02-04 08:34:27 -05:00
Brad King ca4bb89f27 Merge topic 'ci-clang-windows' 
c1f4bd792b ci: Add LLVM/Clang 13.0 nightly CI jobs on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6938
 2022-02-04 08:26:56 -05:00
Brad King c1f4bd792b ci: Add LLVM/Clang 13.0 nightly CI jobs on Windows 
Add jobs covering the `clang-cl` front-end with Ninja and NMake.
Add a job covering the `clang++` front-end with Ninja.
 2022-02-04 08:24:53 -05:00
Brad King f84dcbd496 Merge topic 'post-rel-dev' 
9a48012f93 Configure CMake itself with policies through CMake 3.22
a5a9687799 export: Increase maximum policy version in exported files to 3.22
a9ffded98c Add deprecation warnings for policies CMP0097 and below

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6948
 2022-02-04 08:24:26 -05:00
Brad King 57692659c6 Merge branch 'release-3.23' 2022-02-04 08:21:37 -05:00
Brad King b5e897ebe0 Merge branch 'release-3.22' 2022-02-04 08:21:35 -05:00
Brad King 5c9bf43a1f Merge branch 'release-3.22' into release-3.23 2022-02-04 08:21:25 -05:00
Brad King 53839b9c91 Merge branch 'release-3.23' 2022-02-04 08:20:23 -05:00
Brad King 0d0831e481 Merge topic 'default-extensions' 
4ef6e27cb9 CompilerId: Fix default extensions check for Clang targeting MSVC ABI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6949
 2022-02-04 08:20:23 -05:00
Brad King a2b5ef3b36 Merge topic 'default-extensions' into release-3.23 
4ef6e27cb9 CompilerId: Fix default extensions check for Clang targeting MSVC ABI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6949
 2022-02-04 08:20:21 -05:00
Brad King eca869cc0d Merge branch 'release-3.23' 2022-02-04 08:19:19 -05:00
Brad King 1198a23d5d Merge topic 'vs-simplify-pch' 
dd1e2cc80c VS: Simplify generation of per-source PCH settings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6950
 2022-02-04 08:19:19 -05:00
Brad King ce00bfd75e Merge topic 'vs-simplify-pch' into release-3.23 
dd1e2cc80c VS: Simplify generation of per-source PCH settings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6950
 2022-02-04 08:19:18 -05:00
Brad King 28e1ef6761 Merge branch 'release-3.23' 2022-02-04 08:18:13 -05:00
Brad King cf68f52875 Merge topic 'ep-patch-USES_TERMINAL' 
cbb87e0a2c ExternalProject: Add support for USES_TERMINAL_PATCH keyword

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6940
 2022-02-04 08:18:13 -05:00
Brad King 01b89d2547 Merge topic 'ep-patch-USES_TERMINAL' into release-3.23 
cbb87e0a2c ExternalProject: Add support for USES_TERMINAL_PATCH keyword

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6940
 2022-02-04 08:18:12 -05:00