mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 06:09:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
66,536 Commits 2 Branches 401 Tags
cd4782bac3f3add76ef09d3fc3d6b57eb31748a8
Commit Graph

66536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hermann von Kleist cd4782bac3 FindMatlab: Only consider versioned MCR subdirectory if it exists 
Issue: #26306
 2024-09-18 11:16:03 -04:00
Brad King d31f4b645b Merge topic 'FindPython-FIND_ABI' into release-3.30 
f885b007b9 FindPython: ensure all ABI are searched by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Tested-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9819
 2024-09-16 06:17:57 -04:00
Brad King cca09318d4 Merge topic 'matlab-2024b' into release-3.30 
20412181e9 FindMatlab: Add R2024b version map

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9813
 2024-09-13 09:21:14 -04:00
Marc Chevrier f885b007b9 FindPython: ensure all ABI are searched by default 
Fixes: #26279
 2024-09-12 19:22:40 +02:00
scivision 20412181e9 FindMatlab: Add R2024b version map 2024-09-12 12:34:00 -04:00
Brad King 641976a36b Merge branch 'release-3.29' into release-3.30 2024-09-10 08:16:20 -04:00
Brad King a0e6360639 Merge topic 'librhash-glibc-version' into release-3.30 
628a807730 librhash: aligned_alloc is not available with glibc < 2.16

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9804
 2024-09-10 08:06:07 -04:00
Brad King 34215cc011 Merge topic 'librhash-glibc-version' into release-3.29 
628a807730 librhash: aligned_alloc is not available with glibc < 2.16

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9804
 2024-09-10 07:55:39 -04:00
Dilshod Mukhtarov 628a807730 librhash: aligned_alloc is not available with glibc < 2.16 
Revise the version check from commit e14300816b (librhash: aligned_alloc
is not available with glibc < 2.15, 2024-02-14, v3.29.0-rc2~30^2).

Issue: #25679
 2024-09-09 09:45:04 -04:00
Craig Scott 126e0ad429 Merge topic 'cmp0168-populate-nondeclare-regression' into release-3.30 
cbb727ca6b FetchContent: Don't update verify script timestamp if it doesn't change
795e7b44f2 Help: file(CONFIGURE) only updates output file timestamp if it changes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9799
 2024-09-08 18:32:38 -04:00
Craig Scott cbb727ca6b FetchContent: Don't update verify script timestamp if it doesn't change 
Fixes: #26255
 2024-09-06 15:53:48 +10:00
Craig Scott 795e7b44f2 Help: file(CONFIGURE) only updates output file timestamp if it changes 2024-09-06 15:48:38 +10:00
Brad King 3cc9cb6ee2 CMake 3.30.3 v3.30.3 2024-08-29 15:37:11 -04:00
Brad King 998a34b103 Merge branch 'release-3.29' into release-3.30 2024-08-29 15:15:52 -04:00
Brad King 16fbb8c142 CMake 3.29.8 v3.29.8 2024-08-29 14:33:54 -04:00
Brad King 90db124cdf Merge topic 'project_ensure_non_cache_variables' into release-3.30 
c1ece78d11 project: non cache <project> prefix variables are also created

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9779
 2024-08-29 08:26:40 -04:00
Robert Maynard c1ece78d11 project: non cache <project> prefix variables are also created 
Fixes #26243, #25714
 2024-08-27 12:37:07 -04:00
Brad King a0317334ae Merge topic 'FindPython-free-threaded-python' into release-3.30 
10abd2ac5a FindPython: ensure a usable environment is set for the free threaded Python

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9775
 2024-08-27 09:42:37 -04:00
Marc Chevrier 10abd2ac5a FindPython: ensure a usable environment is set for the free threaded Python 
Define the `Python_DEFINITIONS` variable for the support of free
threaded Python developments on Windows.

This is a complement to commit 9a0dee7257 (FindPython: Add support for
free threaded python, 2024-05-30).
 2024-08-27 09:27:35 -04:00
Brad King 7400c1e9bb Merge topic 'FindPython-numpy-mkl' into release-3.30 
516124ea23 FindPython: fix regression of NumPy detection with Intel MKL library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9776
 2024-08-27 09:21:32 -04:00
Even Rouault 516124ea23 FindPython: fix regression of NumPy detection with Intel MKL library 
Fix commit df551ee538 (FindPython: fix NumPy detection when Intel MKL
library is installed, 2024-03-20, v3.30.0-rc1~361^2) by setting
`MKL_ENABLE_INSTRUCTIONS` to `SSE4_2`, but only if
`MKL_ENABLE_INSTRUCTIONS` is not set in the calling environment.

Fixes: #26240
 2024-08-26 10:27:55 -04:00
Brad King bfa7a5445b Merge topic 'android-ndk-27' into release-3.30 
24cd4ff844 Android: Fix build with NDK 27

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9766
 2024-08-26 09:46:26 -04:00
Lars Schmertmann 24cd4ff844 Android: Fix build with NDK 27 
`NDK_PROC_*_ABI` and `NDK_ARCH_*_ABI` were removed in the Android
NDK 27 but will be reintroduced in the Android NDK 27b:

* https://github.com/android/ndk/issues/2049
* https://android-review.googlesource.com/c/platform/ndk/+/3196345

Both are only used when `CMAKE_ANDROID_ARCH_ABI` is NOT given. But
currently the existence is also checked when `CMAKE_ANDROID_ARCH_ABI`
is given. So we move the checks to the position they are required.
 2024-08-22 09:30:01 -04:00
Brad King 0e217de343 Merge topic 'ci-xcode-15.4' into release-3.30 
a05de59029 gitlab-ci: update macOS jobs to use Xcode 15.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9761
 2024-08-21 08:50:23 -04:00
Brad King 3b8e86d121 Merge topic 'ci-msvc-14.41' into release-3.30 
c89ddecb94 gitlab-ci: Update Windows builds to MSVC 14.41 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9763
 2024-08-21 08:47:08 -04:00
Brad King c89ddecb94 gitlab-ci: Update Windows builds to MSVC 14.41 toolset 2024-08-20 15:27:43 -04:00
Brad King a05de59029 gitlab-ci: update macOS jobs to use Xcode 15.4 2024-08-20 14:58:19 -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 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 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
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
Brad King 6fb9e92238 ci: update to use ninja 1.12.1 2024-08-19 13:41:42 -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 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 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
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: https://github.com/openjdk/jdk/commit/8fbcc8239a3fc04e56ebbd287c7bb5db731977b7
Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1078446
 2024-08-15 09:41:57 -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 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
Christoph Grüninger f742c298a0 cppdap: include/dap/network.h: add <stdint.h> include for GCC 15 
GCC 15 requires the include for the declaration of `uint32_t`.
Backport [cppdap PR 133](https://github.com/google/cppdap/pull/133).
 2024-08-13 15:42:40 -04:00
Brad King 7486f468fb curl: Avoid using HTTP/2 with curl 8.7.x due to bug in error codes 
curl 8.7.x has a bug in HTTP/2 error codes introduced by
commit `0dc036225` (HTTP/2: write response directly, 2024-01-31,
`curl-8_7_0~230`) and fixed by commit `5c59f9142` (http2 + ngtcp2:
pass CURLcode errors from callbacks, 2024-04-18, `curl-8_8_0~181`).

Fixes: #26200
 2024-08-13 15:07:53 -04:00
Brad King 1a74f95656 file(DOWNLOAD): Fix User-Agent to use run-time curl version 
If CMake is linked to a system-provided curl shared library, the version
at run-time may not match the `LIBCURL_VERSION` at build time.  Look up
the run-time curl version to populate the User-Agent string.

This is particularly important since commit d3cbee99e3 (macOS: Prefer
building with system-provided curl, 2024-05-09, v3.30.0-rc1~130^2~1)
switched to building our official binaries on macOS against the system
provided curl shared library.

Fixes: #26209
 2024-08-13 14:14:10 -04:00
Brad King d88682dff6 CMake 3.30.2 v3.30.2 2024-08-02 09:57:10 -04:00
Brad King edc340230c Merge branch 'release-3.29' into release-3.30 2024-08-02 09:49:27 -04:00
Brad King 931dd7d3a5 Merge topic 'swift-install-names' into release-3.29 
8669176576 Swift: Fix INSTALL_NAME_DIR under CMP0157 NEW behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9692
 2024-08-02 09:48:49 -04:00
Brad King 35e908e0dc Merge topic 'swift-install-names' into release-3.30 
8669176576 Swift: Fix INSTALL_NAME_DIR under CMP0157 NEW behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9692
 2024-08-02 09:47:50 -04:00
Evan Wilde 8669176576 Swift: Fix INSTALL_NAME_DIR under CMP0157 NEW behavior 
Setting `CMAKE_INSTALL_NAME_DIR` or the `INSTALL_NAME_DIR` on Swift
targets had no effect when CMP0157 was set to `NEW`.  This was a result
of missing the `<TARGET_INSTALLNAME_DIR>` before the `<TARGET_SONAME>`.
Fix that and add a test to verify that the install name directory is
included in the install name.

Fixes: #26175
 2024-08-01 10:49:36 -04:00
Brad King 97d0963888 Merge topic 'test-xcode-command-line-tools' into release-3.30 
369052b5d8 Tests: Restore suppression of xcodebuild error with Xcode Command-Line Tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9696
 2024-08-01 09:58:08 -04:00
Brad King 369052b5d8 Tests: Restore suppression of xcodebuild error with Xcode Command-Line Tools 
In commit 40fa2c1c90 (Tests: Cleanup CMake_TEST_XCODE_VERSION code,
2024-04-29, v3.30.0-rc1~183^2) we accidentally stopped capturing the
stderr from `xcodebuild`, causing it to appear in cmake's output.
The error is incidental and tolerated, so do not let the user see it.
 2024-07-31 15:43:04 -04:00