mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-28 01:51:02 -06:00
Code Issues Packages Projects Releases Wiki Activity
66,998 Commits 2 Branches 390 Tags
041a482079baf690f1bf8e9cdc8a7a1922016267
Commit Graph

66998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
041a482079 Merge topic 'vector-reserve-and-emplace' 
abc8410ac7 cmInstallScriptHandler: Reserve and emplace vector entries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9753
 2024-08-20 11:53:49 -04:00
Brad King
52fc175d66 Merge topic 'string-swap-noexcept' 
873b8244f0 String: Make swap method noexcept

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9754
 2024-08-20 11:52:00 -04:00
Brad King
be881e89a8 Merge topic 'optimize-stream-shift-operators' 
5b259985bf Refactor: Optimize some `std::ostream::operator<<()` calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9717
 2024-08-20 11:51:10 -04:00
Brad King
dfe196c7b1 Merge topic 'swift-test-windows' 
0b0c70d1bf Swift: Enable SwiftMixLib Test on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9746
 2024-08-20 11:47:52 -04:00
Brad King
860d9b4f37 Merge topic 'swift-linker-config' 
a34756b622 Swift: Fix typo in linker configuration logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9745
 2024-08-20 11:46:50 -04:00
Brad King
bf514752af Merge topic 'findwx-link-libs' 
bf2a0527cb FindwxWidgets: Add link dependencies for Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9749
 2024-08-20 11:44:01 -04:00
Brad King
8734799848 Merge topic 'doc-refer' 
759776dcdb Help: Check*SourceRuns make text more concise.
5d42177a06 Help: Check*SourceCompiles, Check*CompilerFlag refer to new command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9743
 2024-08-20 11:41:38 -04:00
Brad King
89d7ed5497 Merge topic 'fix-dependencies-searching' 
4d4e008e69 file(GET_RUNTIME_DEPENDENCIES): Fix resolution of repeated ELF dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9704
 2024-08-20 11:38:27 -04:00
Brad King
2ab43d78e1 Merge branch 'release-3.30' 2024-08-20 11:24:46 -04:00
Brad King
5adcac8e08 Merge topic 'FindJNI-no-xcode' 
7402593a08 FindJNI: Improve output on macOS if Xcode is not installed

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9750
 2024-08-20 11:24:46 -04:00
Brad King
9570ff0c7c Merge topic 'FindJNI-no-xcode' into release-3.30 
7402593a08 FindJNI: Improve output on macOS if Xcode is not installed

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9750
 2024-08-20 11:24:44 -04:00
Brad King
c61d7cbbc0 Merge branch 'release-3.30' 2024-08-20 11:21:01 -04:00
Brad King
67a92743ab Merge topic 'ci-ninja-1.12.1' 
6fb9e92238 ci: update to use ninja 1.12.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9756
 2024-08-20 11:21:01 -04:00
Brad King
42fb178506 Merge topic 'ci-ninja-1.12.1' into release-3.30 
6fb9e92238 ci: update to use ninja 1.12.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9756
 2024-08-20 11:20:59 -04:00
Brad King
1918e7e50a Merge branch 'release-3.30' 2024-08-20 11:17:59 -04:00
Brad King
4522a01192 Merge topic 'cpack-nsis-reserved-component-names' 
b1f956529a CPack/NSIS: Fix matching of reserved component names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9757
 2024-08-20 11:17:59 -04:00
Brad King
8eaaa0023e Merge topic 'cpack-nsis-reserved-component-names' into release-3.30 
b1f956529a CPack/NSIS: Fix matching of reserved component names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9757
 2024-08-20 11:17:57 -04:00
Kitware Robot
68f3f3141f CMake Nightly Date Stamp 2024-08-20 00:01:20 -04:00
Rose
873b8244f0 String: Make swap method noexcept 
There is no reason why it should not be `noexcept`.
`std::swap` cannot have any exceptions or handle any.
 2024-08-19 15:10:34 -04:00
Rose
abc8410ac7 cmInstallScriptHandler: Reserve and emplace vector entries 2024-08-19 15:10:19 -04:00
Evan Wilde
0b0c70d1bf Swift: Enable SwiftMixLib Test on Windows 
The SwiftMixLib test was failing on Windows due to a missing link
against swiftCore. On macOS and Linux, there are mechanisms for
extracting the libraries that the object depends on and passing that to
the linker so that the library dependencies don't need to be listed
explicitly. The Windows Swift toolchain does not have this mechanism.

In the future, it would likely make sense for CMake to pass some of the
implicitly required libraries for linking Swift via
`CMAKE_Swift_IMPLICIT_LINK_LIBRARIES`. Unlike the normal mechanisms
though, these libraries would need to be passed even when the link
language is Swift.

For now though, we should get the test up and running again.

Fixes: #25573
 2024-08-19 11:54:12 -07:00
K. R. Walker
b1f956529a CPack/NSIS: Fix matching of reserved component names 
"Console" unexpectedly matches the reserved name regex.  This revealed
that `cmCPackNSISGenerator::CreateComponentDescription()` needs to use
the name returned by `GetSanitizedDirOrFileName()` for the component
file glob.

Fix the change from commit a1af593291 (CPack: Support arbitrary
component name when packaging, 2024-05-01, v3.30.0-rc1~151^2~1) to
address these issues and add related checks to the `CPackNSISGenerator`
test case.

Issue: #23612
 2024-08-19 14:25:31 -04:00
Saleem Abdulrasool
a34756b622 Swift: Fix typo in linker configuration logic 
Fix a typo from commit c1c4cf9545 (Linker configuration: introduce a new
architecture, 2024-06-05): `Swoft` => `Swift`.

Reported-by: Evan Wilde <etceterawilde@gmail.com>
 2024-08-19 14:04:38 -04:00
Brad King
6fb9e92238 ci: update to use ninja 1.12.1 2024-08-19 13:41:42 -04:00
Alex Turbov
5b259985bf Refactor: Optimize some std::ostream::operator<<() calls 2024-08-19 19:42:31 +04:00
Brad King
7402593a08 FindJNI: Improve output on macOS if Xcode is not installed 
Improve the changes from:

* commit efa0e2ddaf (FindJNI: Update for Xcode greater than 12.1 on macOS,
                     2023-08-06, v3.27.2~5^2)
* commit 597139b853 (FindJNI: Restore support for macOS without Xcode,
                     2023-08-11, v3.27.3~8^2)

to avoid leaking `xcodebuild`'s stderr.

Issue: #26229
 2024-08-19 11:37:48 -04:00
Brad King
8fae37d99f Merge topic 'improve-cmJSONHelpers' 
17de44e99b cmJSONHelpers.h: Add some empty lines to split code blocks
0b334e5bfb cmJSONHelpers.h: Add generic predicate checking helper
503a73b183 cmJSONHelpers.h: Use `map::emplace()` instead of `operator[]`
e7dcd51a61 cmJSONHelpers.h: Remove useless `cmStrCat()` call
5096ea7a92 cmJSONHelpers.h: Optimize of adding `Member`s to a vector
f4a2070731 cmJSONHelpers.h: Remove redundant `;`
23be530275 cmJSONHelpers.h: Move variable declaation close to first usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Martin Duffy <martin.duffy@kitware.com>
Merge-request: !9731
 2024-08-19 10:35:18 -04:00
Brad King
103159fe55 Merge topic 'cpack-iss-utf-8' 
e8b9eebd63 CPack/InnoSetup: Template file in UTF-8 BOM to support Unicode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Nikolay Raspopov <raspopov@cherubicsoft.com>
Merge-request: !9740
 2024-08-19 10:32:48 -04:00
Brad King
72f2ef297b Merge topic 'help-options' 
b5b36f95f9 Help: Add clarifying text for some help options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9706
 2024-08-19 10:31:32 -04:00
Brad King
e2bde35870 Merge topic 'doc-preset-env' 
bc5cddbea7 Help: Clarify role and importance of penv{} preset macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9738
 2024-08-19 10:30:13 -04:00
Brad King
c1fc04cfe5 Merge topic 'filesystem-class-check-inheritance' 
2216843fd5 cm_cxx_filesystem: Improve detection of std::filesystem support on GCC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9735
 2024-08-19 10:29:11 -04:00
Brad King
12a4feced4 Merge topic 'refactor-messanger' 
fc36ac6b22 Refactor: Eliminate redundant `operator<<` calls
4fbeeb97aa Refactor: `… << "\n" << std::flush;` → `… << std::endl;`
3855131c53 Refactor: Eliminate sequential calls to `cmSystemTools::Stdout`
efd3f2356a cmMessenger.cxx: Replace `printMessagePreamble` → `getMessageTypeStr`
0b180e0368 cmMessenger.cxx: Move helper functions to anonymous namespace

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9727
 2024-08-19 10:23:36 -04:00
Brad King
e43b0ce82b Merge topic 'ninja-filter' 
d3baf456c2 cm_cxx_features: Ignore ninja warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9736
 2024-08-19 10:19:31 -04:00
Brad King
1a3f8c5a57 Merge topic 'imprve-CMakeLibTests' 
c553be501d CMakeLibTests: Use `runTests`
0146fca12d CMakeLibTests: include `testCommon.h` for `ASSERT_TRUE`
3d9c018f31 CMakeLibTests: Generate `testConfig.h` with source/build paths defined

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9724
 2024-08-19 10:17:23 -04:00
Craig Scott
ea184f510c Merge topic 'doc-fc-project-var-name-clashes' 
13bf4dc9ef Help: State valid scopes for using proj_SOURCE_DIR and proj_BINARY_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9747
 2024-08-19 06:16:34 -04:00
Aliaksandr Averchanka
4d4e008e69 file(GET_RUNTIME_DEPENDENCIES): Fix resolution of repeated ELF dependencies 
When a library file name is encountered multiple times, reuse the result
from the first time.  This more closely matches the behavior of the
dynamic loader on Linux.

Fixes: #24621
 2024-08-19 08:57:04 +03:00
Kitware Robot
43fd48a210 CMake Nightly Date Stamp 2024-08-19 00:02:34 -04:00
PB
bf2a0527cb FindwxWidgets: Add link dependencies for Windows 
Since wxWidgets v3.3, linking against gdiplus and msimg32
Windows libraries is required.
 2024-08-18 20:53:50 +02:00
Kitware Robot
34146501ff CMake Nightly Date Stamp 2024-08-18 00:01:25 -04:00
Craig Scott
dfa4ff89ef Merge topic 'deprecate-CMakeFindFrameworks' 
dd87640a22 CMakeFindFrameworks: Deprecate the module subject to policy CMP0173

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9742
 2024-08-17 18:35:58 -04:00
Craig Scott
13bf4dc9ef Help: State valid scopes for using proj_SOURCE_DIR and proj_BINARY_DIR 
Fixes: #25714
 2024-08-17 16:11:22 +10:00
Kitware Robot
d5b23f5575 CMake Nightly Date Stamp 2024-08-17 00:01:28 -04:00
Kitware Robot
1debc1f2bc CMake Nightly Date Stamp 2024-08-16 00:01:12 -04:00
Michael Hirsch
759776dcdb Help: Check*SourceRuns make text more concise. 
Similar simplification was done in !9641 for Check*SourceCompiles
 2024-08-15 22:33:55 -04:00
Michael Hirsch
5d42177a06 Help: Check*SourceCompiles, Check*CompilerFlag refer to new command 
The CheckSourceCompiles and CheckCompilerFlag would generally be preferred general
command syntax, but users may not realize they exist, so help point them there.
 2024-08-15 22:27:17 -04:00
Craig Scott
dd87640a22 CMakeFindFrameworks: Deprecate the module subject to policy CMP0173 
Fixes: #20446
 2024-08-16 11:10:27 +10:00
Alex Turbov
17de44e99b cmJSONHelpers.h: Add some empty lines to split code blocks 2024-08-15 22:01:34 +04:00
Alex Turbov
0b334e5bfb cmJSONHelpers.h: Add generic predicate checking helper 
And use it in the `cmCMakePresetsGraphReadJSON.cxx` to check
presets schema version in the declarative way.

Co-authored-by: Martin Duffy <martin.duffy@kitware.com>
 2024-08-15 22:01:34 +04:00
raspopov
e8b9eebd63 CPack/InnoSetup: Template file in UTF-8 BOM to support Unicode 2024-08-15 20:05:21 +03:00
Benjamin Buch
bc5cddbea7 Help: Clarify role and importance of penv{} preset macro 
Preset environment variables are always set to the exact value
specified.  The `$penv{}` macro can be used to refer to the parent
environment value to append or prepend to it.

Fixes: #26216
 2024-08-15 11:48:04 -04:00