mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 02:19:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
59,408 Commits 2 Branches 401 Tags
d0451d1a67a880d1c8ff2f2ebfca47904d723bce
Commit Graph

59408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King d0451d1a67 Merge branch 'release-3.24' into release-3.25 2022-10-25 14:27:02 -04:00
Brad King 883798edc4 Merge topic 'try_compile-CMP0128' into release-3.25 
90287792b6 Tests: Avoid running C++11 test on GNU < 4.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7821
 2022-10-25 14:26:17 -04:00
Brad King 19f49a7514 Merge topic 'doc-presets' into release-3.25 
8a413eb8d0 Help: State default preset strategy for architecture and toolset
8de977fa70 Help: Use array consistently in presets manual
e11773e8cf Help: Fix trivial typos related to presets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7817
 2022-10-25 10:37:23 -04:00
Brad King 32386d7c01 Merge topic 'nsis-licence-bom' into release-3.25 
b276d9d8f1 CPack/NSIS: Document BOM mark for UTF-8 encoded LICENSE file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7820
 2022-10-25 10:36:29 -04:00
Brad King 85191f65d2 Merge branch 'release-3.23' into release-3.24 2022-10-25 10:35:42 -04:00
Brad King 6f2e8bace1 Merge branch 'try_compile-CMP0128' into release-3.24 
Merge-request: !7821
 2022-10-25 10:35:30 -04:00
Brad King 07755a160b Merge branch 'release-3.24' into release-3.25 2022-10-25 10:34:14 -04:00
Brad King 0a34bde140 Merge topic 'flang-windows' into release-3.25 
166bc00399 LLVMFlang: Add a required line to define linking rules on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7818
 2022-10-25 10:33:19 -04:00
Mojca Miklavec b276d9d8f1 CPack/NSIS: Document BOM mark for UTF-8 encoded LICENSE file 
Previously this requirement was only mentioned in the 3.20 release
notes.
 2022-10-24 12:58:10 -04:00
Brad King f58d714f5e Merge branch 'flang-windows' into release-3.24 
Merge-request: !7818
 2022-10-24 12:54:01 -04:00
مهدي شينون (Mehdi Chinoune) 166bc00399 LLVMFlang: Add a required line to define linking rules on Windows 
This was missed in commit d34e5a98b8 (LLVMFlang: Add support for
Windows, 2022-09-18, v3.25.0-rc1~102^2).
 2022-10-24 12:53:07 -04:00
Brad King c3f04fe44d Merge topic 'cmake-presets-list-workflow-type' into release-3.25 
75cfbef780 cmake: Support --list-presets=workflow

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Tested-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !7816
 2022-10-24 12:33:31 -04:00
Brad King 29f66bd1cf Merge topic 'doc-ctest' into release-3.25 
36d76ed07c Help: cmake(1), ctest(1), versionadded for key flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7815
 2022-10-24 12:31:15 -04:00
Brad King 4f2bb02d9a Merge branch 'try_compile-CMP0128' into release-3.23 
Merge-request: !7821
 2022-10-24 12:30:24 -04:00
Brad King 30fcc4460f Merge topic 'fix_narrow_conversion' into release-3.25 
f3c918ef1b cmGlobalVisualStudioGenerator: Fix compiling as C++20 in VS 2022

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7814
 2022-10-24 12:21:39 -04:00
Brad King 90287792b6 Tests: Avoid running C++11 test on GNU < 4.7 
The test added in commit 50e90e2828 (try_compile: Honor CMP0128 setting
in test project, 2022-10-18, v3.25.0-rc2~4^2) requires that the compiler
support C++11 mode, so do not run it on GNU compilers that are too old.
 2022-10-24 12:04:57 -04:00
Craig Scott 8a413eb8d0 Help: State default preset strategy for architecture and toolset 2022-10-22 16:21:34 +11:00
Craig Scott 8de977fa70 Help: Use array consistently in presets manual 
When referring to data in a JSON array, use "array" consistently
rather than "list". This avoids ambiguity over whether we mean
a string containing a CMake list, or a JSON array.

Fixes: #24074
 2022-10-22 16:19:19 +11:00
Craig Scott e11773e8cf Help: Fix trivial typos related to presets 2022-10-22 16:17:13 +11:00
Werner, Joerg f3c918ef1b cmGlobalVisualStudioGenerator: Fix compiling as C++20 in VS 2022 
Adding missing narrow string conversion.
 2022-10-21 11:01:16 -04:00
Michael Hirsch 36d76ed07c Help: cmake(1), ctest(1), versionadded for key flags 2022-10-21 10:55:15 -04:00
Kyle Edwards 75cfbef780 cmake: Support --list-presets=workflow 
Fixes: #24072
 2022-10-21 10:21:21 -04:00
Brad King 63d28469cd Merge topic 'doc-cli-xrefs' into release-3.25 
3043c17039 Help: Add more CLI `:option:` references to various pages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7811
 2022-10-21 10:19:53 -04:00
Brad King fbea7d4181 Merge topic 'doc-find_package-search-path-versionadded' into release-3.25 
65dc8aa8b3 Help: Mention CMake version for a recently-added `find_package` search path
93871cb5a9 Help: Reformat find_package search paths as Sphinx tables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7810
 2022-10-21 10:18:51 -04:00
Brad King 55764f873c Merge branch 'release-3.24' into release-3.25 2022-10-21 10:11:54 -04:00
Brad King b6ddcbc7ec Merge branch 'release-3.23' into release-3.24 2022-10-21 10:11:37 -04:00
Brad King d44340115f Merge topic 'filesystem-path-c++03-abi' into release-3.25 
ee9805ccd1 cm/filesystem: Fix crash with pre-C++11 std::string GNU ABI in C++17

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7813
 2022-10-21 10:06:20 -04:00
Brad King 32c0f964bc Merge topic 'test-git-protocol-file' into release-3.25 
79ce0f434e Tests: Explicitly allow usage of git file-based protocol in test cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7812
 2022-10-21 10:05:18 -04:00
Brad King 47063db58d Merge branch 'filesystem-path-c++03-abi' into release-3.24 
Merge-request: !7813
 2022-10-20 19:03:52 -04:00
Brad King 199b3e580d Merge branch 'filesystem-path-c++03-abi' into release-3.23 
Merge-request: !7813
 2022-10-20 19:03:19 -04:00
Brad King ee9805ccd1 cm/filesystem: Fix crash with pre-C++11 std::string GNU ABI in C++17 
The `remove_filename` and `replace_extension` methods compute an offset
between the whole path in a `std::string` and a part of a path in a
`std::string_view`.  This is done by subtracting their `.data()`
pointers.  However, C++17 adds a non-const `.data()` through which
modification of the string is allowed.  This means the copy-on-write
implementation used by the pre-C++11 std::string GNU ABI must reallocate
if the string has been copied.  Our subtraction then computes an offset
between two different allocations, which is undefined behavior.

The workaround in commit b3ca4f9ad1 (cm/filesystem: Work around crash
when compiled for CYGWIN/MSYS runtime, 2021-04-22, v3.21.0-rc1~271^2~2)
avoided the problem by calling the non-const `.data()` to reallocate
before constructing the `string_view`.  Instead, explicitly call the
const `.data()` method on the string, which does not reallocate.

Fixes: #22090, #23328
 2022-10-20 18:31:50 -04:00
Brad King 81ebea445d Merge branch 'test-git-protocol-file' into release-3.24 
Merge-request: !7812
 2022-10-20 13:47:08 -04:00
Brad King 79ce0f434e Tests: Explicitly allow usage of git file-based protocol in test cases 
Due to CVE-2022-39253, Git 2.30.6 sets `protocol.file.allow=user` by
default.  The change has also been backported to other Git versions by
distros.  This breaks some of our test cases that use the file-based
protocol locally to simulate real workflows without requiring network
access.  In these cases the file protocol is safe, so explicitly enable
it in the tests.
 2022-10-20 13:45:01 -04:00
Alex Turbov 3043c17039 Help: Add more CLI :option: references to various pages 2022-10-20 11:21:40 -04:00
Alex Turbov 65dc8aa8b3 Help: Mention CMake version for a recently-added find_package search path 
Add a `versionadded` mark for the search path added by commit e55c154c5b
(cmFindPackageCommand: Add one more search path, 2022-06-27,
v3.25.0-rc1~339^2~1).

Fixes: #24067
 2022-10-20 11:17:46 -04:00
Alex Turbov 93871cb5a9 Help: Reformat find_package search paths as Sphinx tables 2022-10-20 11:17:46 -04:00
Brad King 7d710abc87 CMake 3.25.0-rc2 v3.25.0-rc2 2022-10-19 11:22:54 -04:00
Brad King 6fa189f716 Merge topic 'cmake-presets-output-junit' into release-3.25 
bea4ed5430 CTest: Add support for outputJUnitFile in presets
9270a02003 CMakePresets.json: Add outputJUnitFile to test presets schema
757786bb73 Tests: Add test for outputLogFile in CMakePresets.json
b68c3596e7 CMakePresets.json: Disallow extra properties in test output schema

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !7806
 2022-10-19 10:04:29 -04:00
Brad King 86ed35cf63 Merge topic 'mingw-unc' into release-3.25 
9777e4c30e MinGW Makefiles: Quote UNC paths on command lines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7802
 2022-10-19 09:59:59 -04:00
Brad King 9ece08666d Merge branch 'release-3.24' into release-3.25 2022-10-19 09:58:14 -04:00
Brad King 589aa44952 Merge branch 'release-3.23' into release-3.24 2022-10-19 09:58:01 -04:00
Brad King 177c56e3fa Merge topic 'try_compile-CMP0128' into release-3.25 
50e90e2828 try_compile: Honor CMP0128 setting in test project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7803
 2022-10-19 09:57:08 -04:00
Brad King 077e42fe76 Merge topic 'android-path-suffixes' into release-3.25 
7e5b48a7b1 Android: Avoid searching API level directories matching architecture bitness

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7805
 2022-10-19 09:55:59 -04:00
Kyle Edwards bea4ed5430 CTest: Add support for outputJUnitFile in presets 
Fixes: #22400
 2022-10-18 16:52:23 -04:00
Kyle Edwards 9270a02003 CMakePresets.json: Add outputJUnitFile to test presets schema 2022-10-18 15:41:29 -04:00
Brad King 20587e5af9 Merge topic 'doc-flag-init' into release-3.25 
e0075799ed Help: Clarify how language-specific flag environment values are used

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7804
 2022-10-18 15:32:26 -04:00
Kyle Edwards 757786bb73 Tests: Add test for outputLogFile in CMakePresets.json 2022-10-18 15:20:44 -04:00
Kyle Edwards b68c3596e7 CMakePresets.json: Disallow extra properties in test output schema 
And add test for testOutputTruncation being unsupported.
 2022-10-18 14:40:11 -04:00
Ed Hartley 9777e4c30e MinGW Makefiles: Quote UNC paths on command lines 
UNC paths (starting with `\\`) need quotes when generating MinGW
Makefiles to avoid gmake interpreting the first `\` as an escape
character.

Fixes: #24061
 2022-10-18 14:30:57 -04:00
Brad King 588c9c4145 Merge branch 'try_compile-CMP0128' into release-3.24 
Merge-request: !7803
 2022-10-18 14:25:52 -04:00