summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindCURL-libcurl_a'Brad King2024-03-261-0/+2
|\ | | | | | | | | | | | | a76aad6ca6 FindCURL: Add support for finding static `libcurl_a.lib` on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9367
| * FindCURL: Add support for finding static `libcurl_a.lib` on WindowsAlex Overchenko2024-03-251-0/+2
| | | | | | | | Fixes: #25810
* | Merge topic 'swift-color-diagnostics'Brad King2024-03-261-0/+2
|\ \ | | | | | | | | | | | | | | | | | | ff7a09d719 Swift: Honor CMAKE_COLOR_DIAGNOSTICS for command-line build systems Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9365
| * | Swift: Honor CMAKE_COLOR_DIAGNOSTICS for command-line build systemsEvan Wilde2024-03-251-0/+2
| | | | | | | | | | | | | | | | | | Add the missing flags to enable and disable color diagnostics for Swift. Fixes: #25815
* | | Merge topic 'open-watcom'Brad King2024-03-261-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 71d3aa1499 OpenWatcom: Fix Windows3x DLL linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9370
| * | | OpenWatcom: Fix Windows3x DLL linkingJiri Malak2024-03-251-2/+2
| | | | | | | | | | | | | | | | Fix DLL creation for 16-bit Windows.
* | | | Merge topic 'IntelLLVM-Fortran-no-isystem'Brad King2024-03-251-6/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 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
| * | | IntelLLVM: Revert accidental use of -external:I with Fortran compilersBrad King2024-03-241-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | CPack/WIX: Improve formatting of CPACK_WIX_CUSTOM_XMLNS expansionBrad King2024-03-221-1/+1
| | | |
* | | | CPack/WIX: Prepare to provide version-specific WiX templatesBrad King2024-03-221-0/+0
| |_|/ |/| | | | | | | | Move our template for WiX Toolset v3 to a versioned location.
* | | Merge topic 'FindPython_MKL_Workaround'Brad King2024-03-221-0/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | df551ee538 FindPython: fix NumPy detection when Intel MKL library is installed Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9359
| * | | FindPython: fix NumPy detection when Intel MKL library is installedEven Rouault2024-03-211-0/+16
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'matlab-2024a'Brad King2024-03-221-0/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | bade9832e6 FindMatlab: R2024a version map Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9360
| * | FindMatlab: R2024a version mapscivision2024-03-211-0/+1
| | |
| * | Merge topic 'package-dispatch-apple' into release-3.29Brad King2024-03-203-25/+78
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85d6d3b2e3 generate_apple_*_selection_file: Add option to capture errors 2149dbd379 generate_apple_architecture_selection_file: Document $(ARCHS_STANDARD) support be642f6ed5 generate_apple_architecture_selection_file: Simplify signature 8959ad9db1 Tests/RunCMake/CMakePackage: Fix Apple architecture selection argument order 677f3d721b Tests/RunCMake/CMakePackage: Add architecture i386 for macOS on Xcode < 10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9349
* | \ \ Merge topic 'FindSWIG-enhance-lookup-strategy'Brad King2024-03-211-18/+56
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ff66a766f FindSWIG: Enhance lookup capabilities using VALIDATOR argument ef51650558 FindSWIG: Search now all artifacts per directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9357
| * | | | FindSWIG: Enhance lookup capabilities using VALIDATOR argumentMarc Chevrier2024-03-201-18/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, swig executable naming strategy is a bit odd: For example swig4.0 executable can have version 4.2.0!i Moreover, not all platforms provide a versioned executable. So, to pick-up the right executable when multiple versions are available, use find_program(... VALIDATOR ...).
| * | | | FindSWIG: Search now all artifacts per directoryMarc Chevrier2024-03-201-1/+1
| | |_|/ | |/| | | | | | | | | | Fixes: #25566
* | | | Merge topic 'check-strict-prototypes'Brad King2024-03-214-6/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 1a4610269a Modules: Fix checks under -Werror=strict-prototypes Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !9344
| * | | Modules: Fix checks under -Werror=strict-prototypesPeter Kokot2024-03-204-6/+6
| | | | | | | | | | | | | | | | | | | | This fixes configuration checks when using -Werror=strict-prototypes or -Wstrict-prototypes compiler flag, for example, via the CMAKE_C_FLAGS.
* | | | Merge topic 'package-dispatch-apple'Brad King2024-03-203-25/+78
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | 85d6d3b2e3 generate_apple_*_selection_file: Add option to capture errors 2149dbd379 generate_apple_architecture_selection_file: Document $(ARCHS_STANDARD) support be642f6ed5 generate_apple_architecture_selection_file: Simplify signature 8959ad9db1 Tests/RunCMake/CMakePackage: Fix Apple architecture selection argument order 677f3d721b Tests/RunCMake/CMakePackage: Add architecture i386 for macOS on Xcode < 10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9349
| * | generate_apple_*_selection_file: Add option to capture errorsBrad King2024-03-193-10/+62
| | | | | | | | | | | | | | | | | | | | | Add an option to capture error messages in a variable instead of terminating with a fatal error. Fixes: #25778
| * | generate_apple_architecture_selection_file: Document $(ARCHS_STANDARD) supportBrad King2024-03-191-0/+4
| | | | | | | | | | | | | | | | | | Also add a test case. Fixes: #25780
| * | generate_apple_architecture_selection_file: Simplify signatureBrad King2024-03-191-15/+12
| | | | | | | | | | | | | | | | | | | | | Allow callers to pass multiple values to list-valued arguments instead of putting the entire list in a single quoted argument. Fixes: #25779
* | | Merge topic 'doc-release-3.29-typos'Brad King2024-03-192-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | eceb368ccc Help: Fix typos in 3.29 docs 31fb693d06 Help: Fix typos and grammar in pre-3.29 docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9353
| * | Help: Fix typos and grammar in pre-3.29 docsCraig Scott2024-03-192-2/+2
| |/
| * Merge topic 'LINKER_TYPE-mold-support' into release-3.29Brad King2024-03-141-1/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 801ae06952 LINKER_TYPE: Support MOLD only on GCC versions that support it 939ac5287e LINKER_TYPE: fix spelling error in message 922883782b LINKER_TYPE: Document that linker tool should be in the PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9334
| * \ Merge topic 'fc-MakeAvailable-leak-var' into release-3.29Brad King2024-03-141-13/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b68048bdb FetchContent: Don't leak temporary variable and restore var robustly Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !9338
* | \ \ Merge topic 'LINKER_TYPE-mold-support'Brad King2024-03-141-1/+4
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 801ae06952 LINKER_TYPE: Support MOLD only on GCC versions that support it 939ac5287e LINKER_TYPE: fix spelling error in message 922883782b LINKER_TYPE: Document that linker tool should be in the PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9334
| * | | LINKER_TYPE: Support MOLD only on GCC versions that support itMarc Chevrier2024-03-131-1/+4
| | | | | | | | | | | | | | | | Fixes: #25748
* | | | Merge topic 'fc-MakeAvailable-leak-var'Brad King2024-03-141-13/+20
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 2b68048bdb FetchContent: Don't leak temporary variable and restore var robustly Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !9338
| * | | FetchContent: Don't leak temporary variable and restore var robustlyCraig Scott2024-03-131-13/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In FetchContent_MakeAvailable(), the __fcprefix__ previously used when pushing the value of CMAKE_EXPORT_FIND_PACKAGE_NAME to the variable stack is not needed. The stack will never be empty at that point, so pushing an empty value will be handled correctly. By removing the __fcprefix__, we no longer need any temporary variable when restoring CMAKE_EXPORT_FIND_PACKAGE_NAME. But we need to ensure CMAKE_EXPORT_FIND_PACKAGE_NAME is left undefined if it wasn't defined before, and pushing an empty value doesn't let us distinguish between unset and set-but-empty. Therefore, when CMAKE_EXPORT_FIND_PACKAGE_NAME is undefined, push a specific value that can't be used by the project instead and check for that when popping it again. This ensures we can robustly distinguish the two cases and will always restore the right state. Fixes: #25758
* | | Merge topic 'ctest-tls-options'Brad King2024-03-132-9/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aeb8bcc055 ctest: Fall back to CMake options for TLS version 56e319ce4a ctest: Fall back to CMake options for TLS server verification 6671f17f65 ctest: Add explicit options for TLS version 0aba13a2f3 ctest: Add explicit options for TLS server verification 51728a6dd3 CTest: Create scope to isolate defaults for DartConfiguration.tcl 8a3a486fb5 cmCTestCurl: Factor out helper struct for curl options 7f668bb94f cmCTestCurl: Use inline member initialization add81210df cmCurl: Assert that we cover all TLS versions supported by our vendored curl ... Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !9318
| * | | ctest: Fall back to CMake options for TLS versionBrad King2024-03-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `CMAKE_TLS_VERSION` or `ENV{CMAKE_TLS_VERSION}` if `CTEST_TLS_VERSION` is not set. Issue: #25701
| * | | ctest: Fall back to CMake options for TLS server verificationBrad King2024-03-121-0/+3
| | | | | | | | | | | | | | | | Use `CMAKE_TLS_VERIFY` if `CTEST_TLS_VERIFY` is not set.
| * | | ctest: Add explicit options for TLS versionBrad King2024-03-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a dedicated `TLSVersion` ctest option and a `CTEST_TLS_VERSION` variable to control it. Issue: #25701
| * | | ctest: Add explicit options for TLS server verificationBrad King2024-03-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add a dedicated `TLSVerify` ctest option and a `CTEST_TLS_VERIFY` variable to control it. Deprecate `CurlOptions` because it exposes internal implementation details.
| * | | CTest: Create scope to isolate defaults for DartConfiguration.tclBrad King2024-03-121-9/+11
| | | |
* | | | Merge topic 'GoogleTest-source-line'Brad King2024-03-131-4/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0343abd59 GoogleTest: Add DEF_SOURCE_LINE property to gtest_add_tests Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !9327
| * | | | GoogleTest: Add DEF_SOURCE_LINE property to gtest_add_testsDaniel Sim2024-03-111-4/+41
| | | | |
* | | | | Merge topic 'ci-xcode-15.3'Brad King2024-03-131-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 682767e8a5 Merge branch 'backport-3.28-ci-xcode-15.3' e572986231 LinkerId: Update detection of linker tool for Xcode 15.3 8a6d05aa9d gitlab-ci: update macOS jobs to use Xcode 15.3 7bf893bc30 Tests: Update RunCMake.CheckCompilerFlag for Xcode 15.3 7f5f0ab4b3 Tests: Update RunCMake.CompileFeatures for Xcode 15.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9333
| * | | | LinkerId: Update detection of linker tool for Xcode 15.3Brad King2024-03-121-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Xcode now prints extra `ExecuteExternalTool` lines that happen to mention the linker tool, but not in conjunction with actually linking something. Ignore them.
| * | | Merge topic 'llvm-objdump' into release-3.29Brad King2024-03-111-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c51f84b96a GET_RUNTIME_DEPENDENCIES: Allow more whitespace before objdump's "DLL Name:" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !9325
* | \ \ \ Merge topic 'findcudatoolkit_remove_unneeded_deps'Brad King2024-03-121-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d47c5e3358 FindCUDAToolkit: Remove unneeded dependencies on the cuda driver Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9331
| * | | | | FindCUDAToolkit: Remove unneeded dependencies on the cuda driverRobert Maynard2024-03-111-3/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | The nvrtc-builtins and nvptxcompiler projects don't required linking to the cuda driver. We previously did this due to reading the upstream documentation incorrectly.
* | | | | FindCUDA: Support cross-compilation to sbsa-linuxJinzhe Zeng2024-03-111-10/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Port commit 743d4181b4 (FindCUDAToolkit: Support cross-compilation to sbsa-linux, 2023-01-11, v3.26.0-rc1~118^2) to FindCUDA too. Issue: #24192
* | | | Merge topic 'llvm-objdump'Brad King2024-03-111-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | c51f84b96a GET_RUNTIME_DEPENDENCIES: Allow more whitespace before objdump's "DLL Name:" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !9325
| * | | GET_RUNTIME_DEPENDENCIES: Allow more whitespace before objdump's "DLL Name:"Adrian Pop2024-03-101-1/+1
| | | | | | | | | | | | | | | | LLVM's `llvm-objdump` has spaces before "DLL Name:" instead of tabs.
* | | | Merge topic 'marmasm-language'Brad King2024-03-111-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | c34ef6c922 ASM_MARMASM: Remove broken partial support for preprocessor defines Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9326
| * | | ASM_MARMASM: Remove broken partial support for preprocessor definesAlexander Neumann2024-03-101-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid passing unsupported options to the assembler. In commit 3166547cf6 (ASM_MARMASM: Add support for Microsoft ARM assembler language, 2022-10-14, v3.26.0-rc1~383^2) we copied the assembler command line from `CMakeASM_MASMInformation`, but the `marmasm` tool does not accept `-D` command-line options. Issue: #24317