mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-08 16:19:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
66,969 Commits 2 Branches 390 Tags
cc20644c712b5a24ea7c7db83fde3dfde61250d3
Commit Graph

66969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Turbov
cc20644c71 testCommon.h: Introduce ASSERT_EQUAL(actual, expected) macro 
Performs `==` on given arguments and print an error if they are
not equal also printing their values.

Both arguments must be printable to `std::ostream`!
 2024-08-21 02:24:16 +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
Kitware Robot
43fd48a210 CMake Nightly Date Stamp 2024-08-19 00:02:34 -04: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
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
Michael Pratt
2216843fd5 cm_cxx_filesystem: Improve detection of std::filesystem support on GCC 
The check added by commit 40af103402 (cmCMakePath: do not use
std::filesystem::path with RH gcc-toolset-10, 2023-12-02, v3.28.0~5^2)
fails unnecessarily in some cases due to not inheriting
`std::string_view` publicly.

Inheritance into a class is private by default, and this std class has
public members that would be access restricted when used to create
public objects in the current scope.

On some versions of GCC, depending on standards options, this causes
either template instantiation errors, or "inaccessible base" or "not
declared" errors.

Fix by setting the inheritance to public.  This does not affect the
intention of the previous fix because the check still fails when using
gcc-toolset-10's standard library with clang.

Issue: #25458, #25453
 2024-08-15 11:31:01 -04:00
Brad King
2904ce00d2 Merge branch 'release-3.30' 2024-08-15 10:34:27 -04:00
Brad King
a7bc881847 Merge topic 'FindJNI-zero-vm-location' 
983291669d FindJNI: Support finding libjvm.so for all OpenJDK variants

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9725
 2024-08-15 10:34:26 -04:00
Brad King
97bb92ace5 Merge topic 'FindJNI-zero-vm-location' into release-3.30 
983291669d FindJNI: Support finding libjvm.so for all OpenJDK variants

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9725
 2024-08-15 10:34:25 -04:00
Brad King
9b163c6a21 Merge branch 'release-3.30' 2024-08-15 10:08:24 -04:00
Brad King
076784f4f3 Merge branch 'release-3.29' 2024-08-15 10:08:19 -04:00
Brad King
5f42d87aca Merge branch 'release-3.29' into release-3.30 2024-08-15 10:08:10 -04:00
Brad King
0cbb3a4e9c Merge topic 'cppdap-gcc-15' into release-3.30 
f742c298a0 cppdap: include/dap/network.h: add <stdint.h> include for GCC 15

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9713
 2024-08-15 10:07:51 -04:00
Brad King
464719b35b Merge topic 'cppdap-gcc-15' into release-3.29 
f742c298a0 cppdap: include/dap/network.h: add <stdint.h> include for GCC 15

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9713
 2024-08-15 10:02:17 -04:00
Brad King
1d46a7f7ee Merge topic 'update-cppdap' 
f6745ed29f Merge branch 'upstream-cppdap' into update-cppdap
bcfd096ed9 cppdap 2024-08-02 (c69444ed)
5098a08fde cppdap: Update script to get version as of 2024-08-02

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9730
 2024-08-15 09:50:58 -04:00
Brad King
7d74c35dd5 Merge topic 'update-expat' 
6b8ab3c282 expat: Hard-code configuration options for our needs
25c2d60c04 Merge branch 'upstream-expat' into update-expat
865006f033 expat 2024-03-13 (fa75b965)
fc5bbb1f01 expat: Update script to get Expat 2.6.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9729
 2024-08-15 09:49:59 -04:00
Brad King
e0f12564dc Merge topic 'iar-missing-license' 
564d527c04 IAR: Improve error message for missing license

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9723
 2024-08-15 09:48:27 -04:00
Brad King
683910854c Merge topic 'UseJava-verbosity' 
ea62c44b64 UseJava: Reduce add_jar verbosity by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9710
 2024-08-15 09:47:14 -04:00
Brad King
15a94f1d28 Merge topic 'pkg-config' 
25b947589a Modules: Guard calls to pkg_check_modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9709
 2024-08-15 09:46:01 -04:00
WANG Xuerui
983291669d FindJNI: Support finding libjvm.so for all OpenJDK variants 
Formerly only the "client" and "server" variant directories are being
checked for libjvm.so, but according to a 2021 OpenJDK upstream change
present in OpenJDK >= 18, there can be "minimal" and "zero" variants as
well. In particular, formerly (OpenJDK <= 17) the Zero variant had its
libjvm.so in "server/", but "zero/" in newer versions, which regressed
downstream CMake project builds running on systems with OpenJDK Zero VM.

Fix it by checking all 4 variant directories for libjvm.so.

Link: https://bugs.openjdk.org/browse/JDK-8273494
Link: https://github.com/openjdk/jdk/pull/5440
Link: 8fbcc8239a
Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1078446
 2024-08-15 09:41:57 -04:00
Brad King
433cb155b5 Merge branch 'release-3.30' 2024-08-15 09:37:00 -04:00
Brad King
d060b05217 Merge topic 'macos-curl-user-agent' 
1a74f95656 file(DOWNLOAD): Fix User-Agent to use run-time curl version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9726
 2024-08-15 09:37:00 -04:00
Brad King
3265458a79 Merge topic 'macos-curl-user-agent' into release-3.30 
1a74f95656 file(DOWNLOAD): Fix User-Agent to use run-time curl version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9726
 2024-08-15 09:36:58 -04:00
Brad King
67e14b19bc Merge branch 'release-3.30' 2024-08-15 09:35:37 -04:00
Brad King
0460e71e1f Merge topic 'curl-http2' 
7486f468fb curl: Avoid using HTTP/2 with curl 8.7.x due to bug in error codes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9728
 2024-08-15 09:35:37 -04:00
Brad King
16b6847861 Merge topic 'curl-http2' into release-3.30 
7486f468fb curl: Avoid using HTTP/2 with curl 8.7.x due to bug in error codes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9728
 2024-08-15 09:35:35 -04:00
Martin Duffy
b5b36f95f9 Help: Add clarifying text for some help options 
Fixes: #26193
 2024-08-15 09:12:26 -04:00
Craig Scott
41da7a4a9a Merge topic 'fix_condition_android_determine' 
4b84596dcf Android: Fix condition detecting no APIs found in the NDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9721
 2024-08-15 07:18:37 -04:00
Kitware Robot
3e072b018a CMake Nightly Date Stamp 2024-08-15 00:01:17 -04:00
Michael Pratt
d3baf456c2 cm_cxx_features: Ignore ninja warnings 
Future changes to ninja may make harmless warnings more likely.
Filter them out from compiler feature checks.
 2024-08-14 17:27:32 -04:00
Brad King
48c0b01197 Merge topic 'doc-log' 
d03bb13839 Help: version 3.16 added cmake --log-level

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9711
 2024-08-14 13:33:00 -04:00
Brad King
db304b343b Merge topic 'patch-oracle-developer-studio' 
4086e81e38 Help: Rename Oracle Solaris Studio to Oracle Developer Studio

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9715
 2024-08-14 13:29:17 -04:00
Brad King
cf1bc1b937 Merge topic 'emacs-cmake-mode' 
8eb8e27fb2 cmake-mode.el: Use line-beginning-position instead of obsolete point-at-bol

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9714
 2024-08-14 13:25:29 -04:00
Alex Turbov
fc36ac6b22 Refactor: Eliminate redundant operator<< calls 2024-08-14 19:56:54 +04:00