mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-03 12:19:41 -06:00
Code Issues Packages Projects Releases Wiki Activity
62,271 Commits 2 Branches 385 Tags
45f17e5a8566fcdec0071a5ed1bc2656968bf258
Commit Graph

62271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Chevrier
45f17e5a85 cmList: Add container conversion to string 2023-06-22 15:44:17 +02:00
Kitware Robot
88e7ad0084 CMake Nightly Date Stamp 2023-06-21 00:01:14 -04:00
Brad King
aba8762282 Merge branch 'release-3.27' 2023-06-20 13:38:30 -04:00
Brad King
0cd5300665 CMake 3.27.0-rc3 v3.27.0-rc3 2023-06-20 13:11:25 -04:00
Brad King
6961844902 Merge branch 'release-3.27' 2023-06-20 13:10:00 -04:00
Brad King
7bf3d2a202 Merge topic 'android-platform-vars' 
ab66b89a46 Android: Restore platform id vars with legacy toolchain file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8576
 2023-06-20 13:10:00 -04:00
Brad King
fd949f6e01 Merge topic 'android-platform-vars' into release-3.27 
ab66b89a46 Android: Restore platform id vars with legacy toolchain file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8576
 2023-06-20 13:09:58 -04:00
Brad King
1ec4a7c587 Merge branch 'release-3.27' 2023-06-20 13:08:47 -04:00
Brad King
023da1a718 Merge topic 'FindProtobuf-version-schemes' 
fc7dcc6a24 FindProtobuf: Support new version number scheme

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8574
 2023-06-20 13:08:47 -04:00
Brad King
f342a655e4 Merge topic 'FindProtobuf-version-schemes' into release-3.27 
fc7dcc6a24 FindProtobuf: Support new version number scheme

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8574
 2023-06-20 13:08:46 -04:00
Brad King
ab66b89a46 Android: Restore platform id vars with legacy toolchain file 
Restore definition of `ANDROID` and `UNIX` when `CMAKE_SYSTEM_VERSION`
is `1`.  This was broken by commit 1373373823 (enable_language:
Establish target platform identification variables earlier, 2023-06-06,
v3.27.0-rc1~3^2~1).

Fixes: #25004
 2023-06-20 10:39:37 -04:00
Jannik Beyerstedt
fc7dcc6a24 FindProtobuf: Support new version number scheme 
Protobuf changed it's version number scheme with version 21. The first number
(usually the major version) is not synchronized between compiler and library
version, but the second and third number are. See
https://protobuf.dev/news/2022-05-06/ for more details.

Fixes: #24847
 2023-06-20 09:59:53 -04:00
Brad King
9eccac530c Merge branch 'release-3.27' 2023-06-20 09:26:29 -04:00
Brad King
15edabf575 Merge topic 'rel-macos-c++17' 
7b205b7078 ci: Build macOS 10.13+ package as C++17
7f6cebb1cd ci: Split macOS 10.10+ and 10.13+ package language standard selection
aab16d4bfc ci: Drop unnecessary -stdlib flag from macOS package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8567
 2023-06-20 09:26:29 -04:00
Brad King
21d409534a Merge topic 'rel-macos-c++17' into release-3.27 
7b205b7078 ci: Build macOS 10.13+ package as C++17
7f6cebb1cd ci: Split macOS 10.10+ and 10.13+ package language standard selection
aab16d4bfc ci: Drop unnecessary -stdlib flag from macOS package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8567
 2023-06-20 09:26:28 -04:00
Brad King
093dd920ce Merge branch 'release-3.27' 2023-06-20 09:25:40 -04:00
Brad King
8bfef726fa Merge topic 'cmList-SUBLIST-regression' 
1cfaed0684 list(): restore SUBLIST behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8569
 2023-06-20 09:25:40 -04:00
Brad King
e12d6d2503 Merge topic 'cmList-SUBLIST-regression' into release-3.27 
1cfaed0684 list(): restore SUBLIST behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8569
 2023-06-20 09:25:39 -04:00
Kitware Robot
ea1cd8ee7d CMake Nightly Date Stamp 2023-06-20 00:01:10 -04:00
Kitware Robot
af9489a4f2 CMake Nightly Date Stamp 2023-06-19 00:02:05 -04:00
Kitware Robot
cb7dda1c69 CMake Nightly Date Stamp 2023-06-18 00:01:08 -04:00
Kitware Robot
a5e29c4c42 CMake Nightly Date Stamp 2023-06-17 00:01:16 -04:00
Marc Chevrier
1cfaed0684 list(): restore SUBLIST behavior 
Fixes: #25002
 2023-06-16 15:14:03 +02:00
Brad King
8cc4f7824b Merge branch 'release-3.27' 2023-06-16 08:35:35 -04:00
Brad King
827f0bc9a0 Merge topic 'FindPostgreSQL-15' 
80ba2cccfc FindPostgreSQL: Add support for version 15

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8568
 2023-06-16 08:35:35 -04:00
Brad King
8a99acd289 Merge topic 'FindPostgreSQL-15' into release-3.27 
80ba2cccfc FindPostgreSQL: Add support for version 15

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8568
 2023-06-16 08:35:34 -04:00
Brad King
80ba2cccfc FindPostgreSQL: Add support for version 15 2023-06-16 08:21:04 -04:00
Brad King
7b205b7078 ci: Build macOS 10.13+ package as C++17 
Take advantage of the standard library implementations of those C++17
features available when targeting macOS 10.13.  Note that the standard
library `std::filesystem` implementation is not available until 10.15.
 2023-06-16 08:16:43 -04:00
Brad King
387fc61be4 Merge topic 'CMake_TEST_FindPython2-3' 
711d1da125 FindPython: add capability to select python version for the tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8565
 2023-06-16 07:50:51 -04:00
Brad King
4645be97b3 Merge branch 'release-3.27' 2023-06-16 07:49:18 -04:00
Brad King
7956b1f7b1 Merge topic 'fix_tutorial_step7_solution_text' 
a8679c997d Tutorial: Extend literal include to contain full code changes in solution

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8563
 2023-06-16 07:49:18 -04:00
Brad King
8e4cda74fe Merge topic 'fix_tutorial_step7_solution_text' into release-3.27 
a8679c997d Tutorial: Extend literal include to contain full code changes in solution

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8563
 2023-06-16 07:49:17 -04:00
Kitware Robot
da211a5996 CMake Nightly Date Stamp 2023-06-16 00:01:08 -04:00
Markus Ferrell
a8679c997d Tutorial: Extend literal include to contain full code changes in solution 
The solution for step 7 todo 5 did not include all of the code changes.
Modify it to include the needed `#endif` code change.
 2023-06-15 09:29:16 -04:00
Marc Chevrier
711d1da125 FindPython: add capability to select python version for the tests 2023-06-15 15:28:55 +02:00
Brad King
a84c996947 Merge topic 'cmuvprocesschain-external-stream-fd' 
b65d54e876 cmUVStreambuf: Update URL for example code
0878306386 cmUVStream: Add cmUVStreamRead() function
b8fd273ed7 cmUVProcessChain: Return output and error streams as file descriptors
ec81d40be4 cmUVPipeIStream: Add cmUVPipeIStream
3b6c5efc08 cm::append: Add support for std::basic_string on SPARC/SunPro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8559
 2023-06-15 09:27:42 -04:00
Brad King
0b62dede64 Merge topic 'ccmake-keybinds' 
f601a55fc2 ccmake: Additional keybindings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8527
 2023-06-15 09:25:33 -04:00
Brad King
7f6cebb1cd ci: Split macOS 10.10+ and 10.13+ package language standard selection 
Prepare to use a different language standard level for each package.
 2023-06-15 09:21:07 -04:00
Brad King
aab16d4bfc ci: Drop unnecessary -stdlib flag from macOS package 
AppleClang uses `libc++` by default.
 2023-06-15 09:21:07 -04:00
Kitware Robot
883cbf4171 CMake Nightly Date Stamp 2023-06-15 00:01:10 -04:00
Martin Duffy
f601a55fc2 ccmake: Additional keybindings 
Adds the following keys to ccmake:
- w: writes changes to cache file and quits without generating
- N: jump to previous search result
- Home: jump to first option
- End: jump to last option
 2023-06-14 14:15:52 -04:00
Kyle Edwards
b65d54e876 cmUVStreambuf: Update URL for example code 2023-06-14 11:53:55 -04:00
Kyle Edwards
0878306386 cmUVStream: Add cmUVStreamRead() function 2023-06-14 11:53:55 -04:00
Kyle Edwards
b8fd273ed7 cmUVProcessChain: Return output and error streams as file descriptors 2023-06-14 11:53:55 -04:00
Kyle Edwards
ec81d40be4 cmUVPipeIStream: Add cmUVPipeIStream 2023-06-14 11:53:55 -04:00
Kyle Edwards
3b6c5efc08 cm::append: Add support for std::basic_string on SPARC/SunPro 2023-06-14 11:53:55 -04:00
Brad King
ed37038a1c Merge topic 'cross-compiling-emulator-env-var' 
7005dea005 CrossCompiling: Load CMAKE_CROSSCOMPILING_EMULATOR from environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8543
 2023-06-14 09:18:45 -04:00
Brad King
e06b2a526c Merge topic 'remove-vs11-generator' 
536c1de1d4 Drop Visual Studio 11 2012 generator
f444f172c3 cmVisualStudio10TargetGenerator: Remove unused VS-10-only code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8562
 2023-06-14 09:17:53 -04:00
Brad King
c42fb292e9 Merge topic 'ci-macos-ninja-multi-no-sccache' 
ac44557c7b ci: Disable sccache for macOS Ninja Multi-Config nightly job

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8560
 2023-06-14 09:15:54 -04:00
Brad King
a1d50c5449 Merge topic 'ci-ispc' 
15b1cdd67b ci: Update ISPC 1.20.0 macOS binary hashes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8557
 2023-06-14 09:15:13 -04:00