mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 23:00:07 -06:00
Code Issues Packages Projects Releases Wiki Activity
59,545 Commits 2 Branches 385 Tags
fd57ced75a72cd73d2fd01ec0dd9c5cd552f029d
Commit Graph

59545 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot
fd57ced75a CMake Nightly Date Stamp 2022-10-26 00:01:19 -04:00
Brad King
8e64edf1b5 Merge branch 'release-3.25' 2022-10-25 14:27:12 -04:00
Brad King
cdd0bc237e Merge branch 'release-3.24' 2022-10-25 14:27:10 -04:00
Brad King
19262e23dd Merge branch 'release-3.23' 2022-10-25 14:27:09 -04:00
Brad King
d0451d1a67 Merge branch 'release-3.24' into release-3.25 2022-10-25 14:27:02 -04:00
Brad King
2f673feb71 Merge branch 'release-3.25' 2022-10-25 14:26:19 -04:00
Brad King
eab9ddb744 Merge topic 'try_compile-CMP0128' 
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:18 -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
5142effa37 Merge branch 'release-3.25' 2022-10-25 10:37:24 -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
979a9eb89f Merge topic 'doc-presets' 
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
ae8561f690 Merge branch 'release-3.25' 2022-10-25 10:36:30 -04:00
Brad King
ed8b07fd5c Merge topic 'nsis-licence-bom' 
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:30 -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
f4681111ca Merge branch 'release-3.25' 2022-10-25 10:34:20 -04:00
Brad King
2b8569bf13 Merge branch 'release-3.24' 2022-10-25 10:34:19 -04:00
Brad King
07755a160b Merge branch 'release-3.24' into release-3.25 2022-10-25 10:34:14 -04:00
Brad King
0d753774fa Merge branch 'release-3.25' 2022-10-25 10:33:20 -04:00
Brad King
1621c707e7 Merge topic 'flang-windows' 
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:20 -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
Brad King
765d8eda88 Merge topic 'CheckSourceCompiles-Swift' 
3fc971c38b CheckSourceCompiles: For Swift executable, name source 'main.swift'
2345139ab5 CheckSourceCompiles: Add support for Swift
4451a1f54f Tests: Factor out a CMake_TEST_Swift variable for Swift test conditions
f78ad6223a Tests: Provide Apple inspection results to CMakeOnly and RunCMake tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Saleem Abdulrasool <compnerd@compnerd.org>
Merge-request: !7783
 2022-10-25 10:29:36 -04:00
Kitware Robot
30e0358d84 CMake Nightly Date Stamp 2022-10-25 00:01:11 -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
Evan Wilde
3fc971c38b CheckSourceCompiles: For Swift executable, name source 'main.swift' 
Xcode uses its own heuristics to determine whether or not to accept
top-level code in a source file while Ninja uses the swift driver
heuristics.

With the Swift driver, if the module contains a single file, that file
will be parsed as a top-level code context. With Xcode, the single file
will only be parsed as top-level code if the name of that file is
'main.swift'.

To ensure more consistent behavior between the two generators, if we're
building Swift and the try-compile target type is executable or
undefined, we name the file `main.swift` to ensure that both will handle
the single file as top-level code.
 2022-10-24 12:39:21 -04:00
Evan Wilde
2345139ab5 CheckSourceCompiles: Add support for Swift 
Plumb through swift `check_source_compiles` support.  Add tests to check
that valid swift sources compile and invalid sources don't.
 2022-10-24 12:39:21 -04:00
Brad King
4451a1f54f Tests: Factor out a CMake_TEST_Swift variable for Swift test conditions 2022-10-24 12:37:50 -04:00
Brad King
c2ec949a05 Merge topic 'set_environment_generator' 
3c3bce133d cmake: Honor CMAKE_GENERATOR env var in --help output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !7808
 2022-10-24 12:35:33 -04:00
Brad King
a693ca6e4a Merge branch 'release-3.25' 2022-10-24 12:33:32 -04:00
Brad King
68950c529a Merge topic 'cmake-presets-list-workflow-type' 
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:32 -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
25cc0e3715 Merge branch 'release-3.25' 2022-10-24 12:31:16 -04:00
Brad King
5bbca910e5 Merge topic 'doc-ctest' 
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:16 -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
2df71170b0 Merge branch 'release-3.25' 2022-10-24 12:21:40 -04:00
Brad King
916bf06a2f Merge topic 'fix_narrow_conversion' 
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:40 -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
Kitware Robot
b295b9951f CMake Nightly Date Stamp 2022-10-24 00:01:23 -04:00
Kitware Robot
59102e06ec CMake Nightly Date Stamp 2022-10-23 00:01:09 -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
Kitware Robot
0678461170 CMake Nightly Date Stamp 2022-10-22 00:01:19 -04: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