Commit Graph

66551 Commits

Author SHA1 Message Date
Brad King
5e4526d6dd CMake 3.30.4 2024-09-27 08:32:31 -04:00
Brad King
035ca0569e Merge topic 'project-vars' into release-3.30
73a8f944b2 Help: Add 3.30 release notes for project variable updates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9853
2024-09-27 07:58:41 -04:00
Brad King
73a8f944b2 Help: Add 3.30 release notes for project variable updates
Add a 3.30.3 release note for commit c1ece78d11 (project: non cache
<project> prefix variables are also created, 2024-08-27, v3.30.3~2^2).
Prepare a 3.30.4 release note for commit 86ad7cc886 (project: Only
define non-cache vars if already defined, 2024-09-15).
2024-09-26 09:41:33 -04:00
Brad King
3c2605dece Merge topic 'project-vars' into release-3.30
86ad7cc886 project: Only define non-cache vars if already defined
4c152752da Help: State valid scopes for using proj_SOURCE_DIR and proj_BINARY_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9820
2024-09-23 14:13:56 -04:00
Craig Scott
86ad7cc886 project: Only define non-cache vars if already defined
In c1ece78d11 (project: non cache <project> prefix variables are
also created, 2024-08-27), we started explicitly setting the non-cache
variable for <projectName>_SOURCE_DIR, <projectName>_BINARY_DIR,
and <projectName>_IS_TOP_LEVEL in addition to setting them as
cache variables. This changed the behavior when a project name
was used more than once, and the second project call happens in
the same scope or a child scope of the first. Previously, the first
project call would set cache variables, and the second project call
would not overwrite those cache variables. With the change in
c1ece78d11, after the second project call the non-cache variables
would mask the cache variables and the project code would see
a different value to what it did before.

Setting the non-cache variable was added to handle the case where
a call to FetchContent_MakeAvailable() would set some non-cache
variables, and it just so happened those matched the same cache
variables that the project() command would set in the project being
fetched. The fetched project would then see a different set of
project-specific variables compared to when it was built standalone.

This commit here narrows the change from c1ece78d11 such that
the non-cache variable is only set by project() if there was already
a non-cache variable set. This still fixes the motivating problem
c1ece78d11 was intended to solve, but it avoids changing the variable
values seen by a project that re-uses the same project name in related scopes.

Issue: #26243, #25714
Fixes: #26281
2024-09-20 10:33:25 -04:00
Craig Scott
4c152752da Help: State valid scopes for using proj_SOURCE_DIR and proj_BINARY_DIR
Issue: #25714
2024-09-20 10:33:25 -04:00
Brad King
6323fdc9cf Merge topic 'cpack-nuget-native' into release-3.30
c358872976 CPack/NuGet: Add native0.0 to build dependencies in groups

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9829
2024-09-20 10:05:52 -04:00
Brad King
304c47a7c1 Merge topic 'FindMatlab-mcr' into release-3.30
9ceca05e6b FindMatlab: Search mex and mx libraries for MCR
67e3c6b6eb FindMatlab: Cache whether MATLAB root contains MCR or MATLAB
b426ce1d04 FindMatlab: Add support for MCR distributions without mex.h
cd4782bac3 FindMatlab: Only consider versioned MCR subdirectory if it exists

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9831
2024-09-20 10:04:20 -04:00
Brad King
c544ad8725 Merge topic 'ci-xcode-16.0' into release-3.30
cc293b4963 ci: Run RunCMake.ExternalProject serially in macos-x86_64 Xcode job
26359076c8 gitlab-ci: update macOS jobs to use Xcode 16.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9830
2024-09-20 10:02:52 -04:00
Brad King
cc293b4963 ci: Run RunCMake.ExternalProject serially in macos-x86_64 Xcode job
Running tests concurrently makes the machine busy enough that the
`INACTIVITY_TIMEOUT` test cases timeout.  Run it serially.
2024-09-19 10:44:01 -04:00
Hermann von Kleist
9ceca05e6b FindMatlab: Search mex and mx libraries for MCR
Further changes:
- Better documentation of library availabilities
- Log each library location in debug mode

Fixes: #26306
2024-09-19 15:33:19 +02:00
Hermann von Kleist
67e3c6b6eb FindMatlab: Cache whether MATLAB root contains MCR or MATLAB
Fixes: #26306
2024-09-19 15:33:06 +02:00
Diego Dassie
c358872976
CPack/NuGet: Add native0.0 to build dependencies in groups
Add the `native0.0` framework to the list of allowed frameworks allowing
native (C/C++) NuGet packages. This extends commit 0f4d3664a9
(CPack/NuGet: Build dependencies in groups, 2024-06-01, v3.30.0-rc1~18^2).

Fixes: #26305
2024-09-19 08:21:38 +02:00
Hermann von Kleist
b426ce1d04 FindMatlab: Add support for MCR distributions without mex.h
Consider `matrix.h` in search for include dirs.

Fixes: #26306
2024-09-18 11:19:16 -04:00
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
26359076c8 gitlab-ci: update macOS jobs to use Xcode 16.0
The `XCTest` fails with Xcode 16.0.
Exclude it pending further investigation.

Issue: #26301
2024-09-17 14:35:26 -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 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 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