summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.30.5v3.30.5Brad King2024-10-082-11/+12
|
* Merge topic 'project-vars' into release-3.30Brad King2024-10-084-11/+48
|\ | | | | | | | | | | | | | | fa07ddfebf project: Only check non-cache vars when setting project vars Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !9883
| * project: Only check non-cache vars when setting project varsCraig Scott2024-10-074-11/+48
|/ | | | | | | | | | | | | | The change in commit 86ad7cc886 (project: Only define non-cache vars if already defined, 2024-09-15, v3.30.4~2^2) was meant to only check for non-cache variables when deciding whether to set non-cache project variables for the current call. However, it erroneously checked for any variable, including cache variables. This gives the intended result on the first run, but on subsequent runs a cache variable will exist that did not on the first run, leading to different behavior between the two runs. Fix the logic to only check for a pre-existing non-cache variable, as was originally intended. Fixes: #26355
* CMake 3.30.4v3.30.4Brad King2024-09-272-10/+11
|
* Merge topic 'project-vars' into release-3.30Brad King2024-09-271-0/+17
|\ | | | | | | | | | | | | 73a8f944b2 Help: Add 3.30 release notes for project variable updates Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9853
| * Help: Add 3.30 release notes for project variable updatesBrad King2024-09-261-0/+17
|/ | | | | | | 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).
* Merge topic 'project-vars' into release-3.30Brad King2024-09-237-14/+76
|\ | | | | | | | | | | | | | | | | 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
| * project: Only define non-cache vars if already definedCraig Scott2024-09-207-12/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Help: State valid scopes for using proj_SOURCE_DIR and proj_BINARY_DIRCraig Scott2024-09-201-2/+9
|/ | | | Issue: #25714
* Merge topic 'cpack-nuget-native' into release-3.30Brad King2024-09-201-0/+3
|\ | | | | | | | | | | | | c358872976 CPack/NuGet: Add native0.0 to build dependencies in groups Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9829
| * CPack/NuGet: Add native0.0 to build dependencies in groupsDiego Dassie2024-09-191-0/+3
| | | | | | | | | | | | | | | | 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
* | Merge topic 'FindMatlab-mcr' into release-3.30Brad King2024-09-201-46/+98
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | FindMatlab: Search mex and mx libraries for MCRHermann von Kleist2024-09-191-42/+78
| | | | | | | | | | | | | | | | | | | | | | | | Further changes: - Better documentation of library availabilities - Log each library location in debug mode Fixes: #26306
| * | FindMatlab: Cache whether MATLAB root contains MCR or MATLABHermann von Kleist2024-09-191-2/+15
| | | | | | | | | | | | Fixes: #26306
| * | FindMatlab: Add support for MCR distributions without mex.hHermann von Kleist2024-09-181-1/+1
| | | | | | | | | | | | | | | | | | Consider `matrix.h` in search for include dirs. Fixes: #26306
| * | FindMatlab: Only consider versioned MCR subdirectory if it existsHermann von Kleist2024-09-181-1/+4
| |/ | | | | | | Issue: #26306
* | Merge topic 'ci-xcode-16.0' into release-3.30Brad King2024-09-203-6/+14
|\ \ | |/ |/| | | | | | | | | | | 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
| * ci: Run RunCMake.ExternalProject serially in macos-x86_64 Xcode jobBrad King2024-09-191-0/+1
| | | | | | | | | | Running tests concurrently makes the machine busy enough that the `INACTIVITY_TIMEOUT` test cases timeout. Run it serially.
| * gitlab-ci: update macOS jobs to use Xcode 16.0Brad King2024-09-172-6/+13
|/ | | | | | | The `XCTest` fails with Xcode 16.0. Exclude it pending further investigation. Issue: #26301
* Merge topic 'FindPython-FIND_ABI' into release-3.30Brad King2024-09-163-37/+23
|\ | | | | | | | | | | | | | | | | 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
| * FindPython: ensure all ABI are searched by defaultMarc Chevrier2024-09-123-37/+23
| | | | | | | | Fixes: #26279
* | Merge topic 'matlab-2024b' into release-3.30Brad King2024-09-131-0/+1
|\ \ | |/ |/| | | | | | | | | 20412181e9 FindMatlab: Add R2024b version map Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9813
| * FindMatlab: Add R2024b version mapscivision2024-09-121-0/+1
|/
* Merge branch 'release-3.29' into release-3.30Brad King2024-09-100-0/+0
|\
| * Merge topic 'librhash-glibc-version' into release-3.29Brad King2024-09-101-1/+1
| |\ | | | | | | | | | | | | | | | | | | 628a807730 librhash: aligned_alloc is not available with glibc < 2.16 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9804
* | \ Merge topic 'librhash-glibc-version' into release-3.30Brad King2024-09-101-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 628a807730 librhash: aligned_alloc is not available with glibc < 2.16 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9804
| * | librhash: aligned_alloc is not available with glibc < 2.16Dilshod Mukhtarov2024-09-091-1/+1
| |/ | | | | | | | | | | | | 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
* | Merge topic 'cmp0168-populate-nondeclare-regression' into release-3.30Craig Scott2024-09-082-2/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | FetchContent: Don't update verify script timestamp if it doesn't changeCraig Scott2024-09-061-1/+3
| | | | | | | | | | | | Fixes: #26255
| * | Help: file(CONFIGURE) only updates output file timestamp if it changesCraig Scott2024-09-061-1/+3
|/ /
* | CMake 3.30.3v3.30.3Brad King2024-08-292-8/+9
| |
* | Merge branch 'release-3.29' into release-3.30Brad King2024-08-291-2/+2
|\ \ | |/
| * CMake 3.29.8v3.29.8Brad King2024-08-292-3/+3
| |
* | Merge topic 'project_ensure_non_cache_variables' into release-3.30Brad King2024-08-293-0/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | project: non cache <project> prefix variables are also createdRobert Maynard2024-08-273-0/+19
| | | | | | | | | | | | Fixes #26243, #25714
* | | Merge topic 'FindPython-free-threaded-python' into release-3.30Brad King2024-08-274-0/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 10abd2ac5a FindPython: ensure a usable environment is set for the free threaded Python Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9775
| * | | FindPython: ensure a usable environment is set for the free threaded PythonMarc Chevrier2024-08-274-0/+45
| |/ / | | | | | | | | | | | | | | | | | | | | | 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).
* | | Merge topic 'FindPython-numpy-mkl' into release-3.30Brad King2024-08-271-9/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | FindPython: fix regression of NumPy detection with Intel MKL libraryEven Rouault2024-08-261-9/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'android-ndk-27' into release-3.30Brad King2024-08-261-9/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 24cd4ff844 Android: Fix build with NDK 27 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9766
| * | Android: Fix build with NDK 27Lars Schmertmann2024-08-221-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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.
* | | Merge topic 'ci-xcode-15.4' into release-3.30Brad King2024-08-211-6/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a05de59029 gitlab-ci: update macOS jobs to use Xcode 15.4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9761
| * | | gitlab-ci: update macOS jobs to use Xcode 15.4Brad King2024-08-201-6/+6
| |/ /
* | | Merge topic 'ci-msvc-14.41' into release-3.30Brad King2024-08-211-12/+12
|\ \ \ | |/ / |/| | | | | | | | | | | | | | c89ddecb94 gitlab-ci: Update Windows builds to MSVC 14.41 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9763
| * | gitlab-ci: Update Windows builds to MSVC 14.41 toolsetBrad King2024-08-201-12/+12
|/ /
* | Merge topic 'FindJNI-no-xcode' into release-3.30Brad King2024-08-201-1/+3
|\ \ | | | | | | | | | | | | | | | | | | 7402593a08 FindJNI: Improve output on macOS if Xcode is not installed Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9750
| * | FindJNI: Improve output on macOS if Xcode is not installedBrad King2024-08-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'ci-ninja-1.12.1' into release-3.30Brad King2024-08-205-48/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | ci: update to use ninja 1.12.1Brad King2024-08-195-48/+17
| |/ /
* | | Merge topic 'cpack-nsis-reserved-component-names' into release-3.30Brad King2024-08-204-3/+45
|\ \ \ | |/ / |/| | | | | | | | | | | | | | b1f956529a CPack/NSIS: Fix matching of reserved component names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9757