Commit Graph

65529 Commits

Author SHA1 Message Date
Jake D'Esposito 304396d13c ctest: Show error on invalid ctest arguments
Fixes: #24227
2024-04-03 21:33:19 -04:00
Jake D'Esposito 06cb978c1b Tests: Fix ctest flag typo in RunCMake.GoogleTest 2024-04-03 21:32:08 -04:00
Brad King 6fa8eecfd0 Merge branch 'release-3.29' 2024-03-26 09:07:24 -04:00
Brad King be7c1d1cfa Merge branch 'release-3.28' 2024-03-26 09:07:22 -04:00
Brad King d26526a36f Merge branch 'release-3.28' into release-3.29 2024-03-26 09:07:16 -04:00
Brad King e37ed71c86 Merge branch 'release-3.29' 2024-03-26 09:06:21 -04:00
Brad King e6f1dd3106 Merge topic 'libuv-macos-10.5'
e3e2ef1964 libuv: Avoid posix_spawn on macOS < 10.8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9371
2024-03-26 09:06:21 -04:00
Brad King 8b832b353c Merge topic 'libuv-macos-10.5' into release-3.29
e3e2ef1964 libuv: Avoid posix_spawn on macOS < 10.8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9371
2024-03-26 09:06:20 -04:00
Brad King 8fd4110d55 Merge topic 'libuv-macos-10.5' into release-3.28
e3e2ef1964 libuv: Avoid posix_spawn on macOS < 10.8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9371
2024-03-26 09:05:32 -04:00
Brad King c90bcf58ee Merge topic 'FindCURL-libcurl_a'
a76aad6ca6 FindCURL: Add support for finding static `libcurl_a.lib` on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9367
2024-03-26 09:01:01 -04:00
Brad King 41de1c3813 Merge topic 'swift-color-diagnostics'
ff7a09d719 Swift: Honor CMAKE_COLOR_DIAGNOSTICS for command-line build systems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9365
2024-03-26 07:56:12 -04:00
Brad King 60de0b410e Merge topic 'open-watcom'
71d3aa1499 OpenWatcom: Fix Windows3x DLL linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9370
2024-03-26 07:55:18 -04:00
Kitware Robot 4f73a9b74e CMake Nightly Date Stamp 2024-03-26 00:01:12 -04:00
Alex Overchenko a76aad6ca6 FindCURL: Add support for finding static libcurl_a.lib on Windows
Fixes: #25810
2024-03-25 15:31:30 -04:00
Evan Wilde ff7a09d719 Swift: Honor CMAKE_COLOR_DIAGNOSTICS for command-line build systems
Add the missing flags to enable and disable color diagnostics for Swift.

Fixes: #25815
2024-03-25 15:06:13 -04:00
Jiri Malak 71d3aa1499 OpenWatcom: Fix Windows3x DLL linking
Fix DLL creation for 16-bit Windows.
2024-03-25 14:49:50 -04:00
Brad King e3e2ef1964 libuv: Avoid posix_spawn on macOS < 10.8
Since libuv commit `83efa3dd71` (Reland "macos: use posix_spawn instead
of fork", 2022-03-02, v1.44.0~10), `uv_spawn` on macOS < 10.8
has been observed to cause kernel panics and/or resource exhaustion.
This became particularly noticeable in CMake since commit 5420639a8d
(cmExecuteProcessCommand: Replace cmsysProcess with cmUVProcessChain,
2023-06-01, v3.28.0-rc1~138^2~8).  Prefer `fork` over `posix_spawn` in
libuv when targeting macOS < 10.8.

Fixes: #25414
Fixes: #25818
Inspired-by: Ken Cunningham <kencu@macports.org>
2024-03-25 12:11:57 -04:00
Brad King 32d05fab78 Merge branch 'release-3.29' 2024-03-25 10:51:17 -04:00
Brad King b5bb6f7a6d Merge topic 'IntelLLVM-Fortran-no-isystem'
a80d8e839d IntelLLVM: Revert accidental use of -external:I with Fortran compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9368
2024-03-25 10:51:16 -04:00
Brad King 245fa4760c Merge topic 'IntelLLVM-Fortran-no-isystem' into release-3.29
a80d8e839d IntelLLVM: Revert accidental use of -external:I with Fortran compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9368
2024-03-25 10:51:15 -04:00
Kitware Robot 57f50abdc4 CMake Nightly Date Stamp 2024-03-25 00:03:15 -04:00
Brad King a80d8e839d IntelLLVM: Revert accidental use of -external:I with Fortran compilers
In commit 8218aed118 (IntelLLVM: support marking include paths as SYSTEM
directories, 2023-08-15, v3.29.0-rc1~81^2) this flag was added for the C
and C++ compilers, but was accidentally added for Fortran too.  Remove
it for the latter, as it is unsupported.

Issue: #25807
2024-03-24 15:03:11 -04:00
Brad King 729d904050 Merge topic 'cpack-wix'
d15c910a45 CPack/WIX: Remove "candle" from tool-agnostic error message
ac25c645a7 CPack/WIX: Improve formatting of CPACK_WIX_CUSTOM_XMLNS expansion
54d09a2b3f CPack/WIX: Document WiX Toolset v3 tools
d2f4836f8e CPack/WIX: Prepare to provide version-specific WiX templates
438809d3ba cmCPackGenerator: Add option to FindTemplate to use alternate builtin path
4d661e3a92 cmMakefile: Reduce GetModulesFile caller allocations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9363
2024-03-24 14:35:14 -04:00
Brad King 7c326643ad Merge topic 'file-RPATH-large-ELF'
615a1c6691 cmELF: Get correct section count for large ELF binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9310
2024-03-24 14:34:23 -04:00
Brad King 7f7105aa2c Merge branch 'release-3.29' 2024-03-24 14:33:31 -04:00
Brad King 899af83755 Merge topic 'linker-vars-propagate-try_compile'
98cc86e265 try_compile(): Include languages with _ or - when passing linker vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9361
2024-03-24 14:33:31 -04:00
Brad King 78e89edab4 Merge topic 'linker-vars-propagate-try_compile' into release-3.29
98cc86e265 try_compile(): Include languages with _ or - when passing linker vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9361
2024-03-24 14:33:30 -04:00
Craig Scott dbe05e4d7c Merge topic 'doc-tool'
be6763f34b Help: cmake(1) --toolchain path relative

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9364
2024-03-24 07:14:55 -04:00
Kitware Robot 6cddfdf974 CMake Nightly Date Stamp 2024-03-24 00:01:12 -04:00
Kitware Robot 86b55fd236 CMake Nightly Date Stamp 2024-03-23 00:01:13 -04:00
scivision be6763f34b Help: cmake(1) --toolchain path relative
other cmake(1) options are relative to cwd. It is surprising
enough that --toolchain is relative to -B or -S that it's
good to call it out here too.
2024-03-22 17:17:31 -04:00
Martin Duffy 615a1c6691 cmELF: Get correct section count for large ELF binaries
Fixes: #24877
2024-03-22 10:18:06 -04:00
Brad King d15c910a45 CPack/WIX: Remove "candle" from tool-agnostic error message 2024-03-22 09:58:42 -04:00
Brad King ac25c645a7 CPack/WIX: Improve formatting of CPACK_WIX_CUSTOM_XMLNS expansion 2024-03-22 09:58:42 -04:00
Brad King 54d09a2b3f CPack/WIX: Document WiX Toolset v3 tools
Add a dedicated section describing the `candle` and `light` tools.
Also improve formatting of some variables' documentation.
2024-03-22 09:58:37 -04:00
Brad King d2f4836f8e CPack/WIX: Prepare to provide version-specific WiX templates
Move our template for WiX Toolset v3 to a versioned location.
2024-03-22 09:51:06 -04:00
Brad King 438809d3ba cmCPackGenerator: Add option to FindTemplate to use alternate builtin path 2024-03-22 09:51:06 -04:00
Brad King 4d661e3a92 cmMakefile: Reduce GetModulesFile caller allocations 2024-03-22 09:51:06 -04:00
Brad King cff8aefc6a Merge topic 'doc-CMP0118'
1dabbbb5e0 CMP0118: Revise documentation to describe actual behavior
d2f5b79795 CMP0118: Fix some tests and add more tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9358
2024-03-22 09:34:31 -04:00
Brad King 5b2e785431 Merge topic 'FindPython_MKL_Workaround'
df551ee538 FindPython: fix NumPy detection when Intel MKL library is installed

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9359
2024-03-22 09:14:39 -04:00
Brad King 976c241845 Merge branch 'release-3.29' 2024-03-22 09:01:54 -04:00
Brad King 0f141fbd68 Merge topic 'matlab-2024a'
bade9832e6 FindMatlab: R2024a version map

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9360
2024-03-22 09:01:54 -04:00
Brad King 0ebe55ae41 Merge topic 'matlab-2024a' into release-3.29
bade9832e6 FindMatlab: R2024a version map

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9360
2024-03-22 09:01:53 -04:00
Craig Scott 98cc86e265 try_compile(): Include languages with _ or - when passing linker vars
Fixes: #25809
2024-03-22 21:35:51 +11:00
Kitware Robot b5926d01ba CMake Nightly Date Stamp 2024-03-22 00:01:12 -04:00
Deniz Bahadir 1dabbbb5e0 CMP0118: Revise documentation to describe actual behavior
The policy was originally intended to make the `GENERATED` source file
property globally visible, but the implementation didn't fully achieve
that goal.  Revise the documentation to describe what it actually does.

Issue: #25437
2024-03-21 11:37:46 -04:00
Even Rouault df551ee538 FindPython: fix NumPy detection when Intel MKL library is installed
In an environment where both NumPy and a recent Intel MKL library are
installed, the detection of numpy include directory fails because a
'import numpy' outputs a MKL related warning message on stdout...
(namely "Intel MKL WARNING: Support of Intel(R) Advanced Vector
Extensions (Intel(R) AVX) enabled only processors has been deprecated.
Intel oneAPI Math Kernel Library will use Intel(R) Streaming SIMD
Extensions 4.2 (Intel(R) SSE4.2) instructions instead.")

I've successfully tested the workaround mentioned at
https://github.com/numpy/numpy/issues/23775#issuecomment-1923327310
which consists in setting the MKL_ENABLE_INSTRUCTIONS=SSE4_2 environment
before importing numpy, hence this proposed workaround.
2024-03-21 16:07:49 +01:00
scivision bade9832e6 FindMatlab: R2024a version map 2024-03-21 10:13:59 -04:00
Brad King df8057645e Merge branch 'release-3.29' 2024-03-21 10:07:54 -04:00
Brad King 25d2850c19 CMake 3.29.0 v3.29.0 2024-03-21 09:32:22 -04:00