summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja-nvhpc-fortran-Werror'Brad King2023-04-271-1/+0
|\ | | | | | | | | | | | | 0f6a1dd3ed Ninja: Revert "Exclude NVHPC -Werror flags during Fortran preprocessing" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8435
| * Ninja: Revert "Exclude NVHPC -Werror flags during Fortran preprocessing"Brad King2023-04-261-1/+0
| | | | | | | | | | | | | | | | | | Revert commit 6b58cdd4cf (Ninja: Exclude NVHPC -Werror flags during Fortran preprocessing, 2023-04-04). Since commit 9d40f01442 (NVHPC: Use -Werror for COMPILE_OPTIONS_WARNING_AS_ERROR, 2023-04-13), `nvfortran` can handle the plain `-Werror` flag during preprocessing. Issue: #24665
* | Merge topic 'ExternalProject-relative-git-urls'Craig Scott2023-04-273-0/+229
|\ \ | | | | | | | | | | | | | | | | | | 550f63447d ExternalProject/FetchContent: Support relative remote URLs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7988
| * | ExternalProject/FetchContent: Support relative remote URLsChris Wright2023-04-263-0/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | Teach `ExternalProject_Add` and `FetchContent_Declare` to resolve relative remote URLs provided via `GIT_REPOSITORY`. Add policy CMP0150 to maintain compatibility. Fixes: #24211 Co-Authored-By: Craig Scott <craig.scott@crascit.com>
* | | VS/Android: Deduce processor type from CMAKE_GENERATOR_PLATFORMMichael Karcher2023-04-261-1/+14
| |/ |/| | | | | Closes: #24839
* | Merge topic 'vs2022-android'Brad King2023-04-264-17/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16d8b65bc0 VS/Android: Use safe API level when detecting the NDK directory f7af10100c VS/Android: Detect full NDK root instead of sysroot 850ee280e0 VS/Android: Set API level explicitly during compiler identification 5d5b6c741d VS/Android: Do not specify Windows Runtime library type during compiler id e78abf94e3 VS/Android: Use ApplicationTypeRevision 3.0 in VS2022 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8426
| * | VS/Android: Use safe API level when detecting the NDK directoryMichael Karcher2023-04-251-0/+1
| | |
| * | VS/Android: Detect full NDK root instead of sysrootMichael Karcher2023-04-252-14/+9
| | | | | | | | | | | | | | | | | | | | | Visual Studio always uses a complete NDK and not a standalone toolchain. Let CMake handle the NDK and related logic correctly, avoid trying to find the standalone toolchain version from the unified clang toolchain in newer NDKs.
| * | VS/Android: Set API level explicitly during compiler identificationMichael Karcher2023-04-252-0/+3
| | | | | | | | | | | | | | | VS2022 defaults to API 31 in 64-bit builds. This breaks if you combine VS2022 with an older Android NDK.
| * | VS/Android: Do not specify Windows Runtime library type during compiler idMichael Karcher2023-04-251-1/+1
| | | | | | | | | | | | | | | | | | The VS2022 Clang toolchain adds some windows libraries to the linked library list if RuntimeLibrary is set, even if the Project is targeting Android. This causes an unexpected linker failure.
| * | VS/Android: Use ApplicationTypeRevision 3.0 in VS2022Michael Karcher2023-04-252-2/+2
| |/ | | | | | | | | | | Visual Studio 17 (Marketing name: Visual Studio 2022) still ships with "3.0" as most recent Variant of the Android application type. Use this revision.
* | Merge topic 'fortran_ninja_compile_as_warning'Brad King2023-04-262-2/+2
|\ \ | | | | | | | | | | | | | | | | | | 9d40f01442 NVHPC: Use -Werror for COMPILE_OPTIONS_WARNING_AS_ERROR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8415
| * | NVHPC: Use -Werror for COMPILE_OPTIONS_WARNING_AS_ERRORRobert Maynard2023-04-252-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | The previously-used `-Werror all-warnings` is not supported by the NVHPC suite of compilers. This previously worked since `-Werror` was being used and `all-warnings` was being excluded. We thought this was the correct syntax due to incorrect documentation about `-Werror`, which stated the argument should be space-separated, while it should actually be separated with `=` or `,`. Issue: #24665
* | Merge topic 'FindCUDAToolkit-static-deps'Brad King2023-04-261-1/+5
|\ \ | | | | | | | | | | | | | | | | | | 1d6c343661 FindCUDAToolkit: Add missing static library dependencies on pthread and libdl Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8422
| * | FindCUDAToolkit: Add missing static library dependencies on pthread and libdlRobert Maynard2023-04-261-1/+5
| | | | | | | | | | | | Discourse-topic: https://discourse.cmake.org/t/7946
* | | Merge topic 'FindCUDAToolkit_nvrtc_windows_dependencies'Brad King2023-04-261-1/+6
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 11a9f88bdf FindCUDAToolkit: Fix nvrtc_static dependencies on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8405
| * | FindCUDAToolkit: Fix nvrtc_static dependencies on WindowsRobert Maynard2023-04-251-1/+6
| |/ | | | | | | | | | | Required for CUDA toolkit 11.5: * https://docs.nvidia.com/cuda/archive/11.5.0/nvrtc/index.html#build-instruction
| * Merge topic 'FindCUDAToolkit-nvptxcompiler_static-deps' into release-3.26Brad King2023-04-061-1/+1
| |\ | | | | | | | | | | | | | | | | | | 8711231739 FindCUDAToolkit: nvptxcompiler_static correctly specify dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8395
* | \ Merge topic 'ninja-nvhpc-fortran-Werror'Craig Scott2023-04-101-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b58cdd4cf Ninja: Exclude NVHPC -Werror flags during Fortran preprocessing Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8393
| * | | Ninja: Exclude NVHPC -Werror flags during Fortran preprocessingBrad King2023-04-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja generator preprocesses Fortran separately in order to scan for module dependencies. NVHPC's `nvfortran` does not support its `-Werror` flag while preprocessing with `-E`, so filter it out. Fixes: #24665
* | | | Merge topic 'FindOpenSSL-mingw'Brad King2023-04-061-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 248689f9bf FindOpenSSL: Fix finding header files and static libraries on MinGW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8394
| * | | | FindOpenSSL: Fix finding header files and static libraries on MinGWمهدي شينون (Mehdi Chinoune)2023-04-051-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * Avoid searching in the `Program Files` folder because the official OpenSSL is built for the MSVC ABI, and so is not compatible with MinGW. * Static libraries on MinGW has `.a` extension.
* | | | Merge topic 'FindCUDAToolkit-nvptxcompiler_static-deps'Brad King2023-04-061-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 8711231739 FindCUDAToolkit: nvptxcompiler_static correctly specify dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8395
| * | | FindCUDAToolkit: nvptxcompiler_static correctly specify dependenciesRobert Maynard2023-04-051-1/+1
| | | | | | | | | | | | | | | | Avoids linking to `Threads::Threads` on non-unix systems where it isn't needed. In addition ensures that dlopen symbols are resolved.
* | | | Merge topic 'FindCUDAToolkit-cusparse-deps'Brad King2023-04-061-6/+9
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | 516d807423 FindCUDAToolkit: Add dependency between cusparse and nvJitLink Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8397
| * | FindCUDAToolkit: Add dependency between cusparse and nvJitLinkRobert Maynard2023-04-051-6/+9
| |/ | | | | | | Starting in CUDA 12.0 cusparse uses nvJitLink. As part of verifying this PR I also corrected the nvJitLink dependencies
| * Merge topic 'swift-xcode-14.3' into release-3.26Brad King2023-04-041-4/+8
| |\ | | | | | | | | | | | | | | | 52dbfefe0d Xcode: Fix detection of Swift compiler location for Xcode 14.3 Merge-request: !8388
| * \ Merge topic 'vs-fortran-try_compile' into release-3.26Brad King2023-04-031-1/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4da50fe3f4 VS: Remove extra try_compile argument in Intel Fortran check Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8383
* | \ \ Merge topic 'FindBLAS-LAPACK-vendor-var'Brad King2023-04-042-8/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d18426c47 Find{BLAS,LAPACK}: Prefer BLA_VENDOR cmake variable over env variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8387
| * | | | Find{BLAS,LAPACK}: Prefer BLA_VENDOR cmake variable over env variableBrad King2023-04-032-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is implied by the documentation, but was not implemented properly. Fixes: #24664
* | | | | Merge topic 'swift-xcode-14.3'Brad King2023-04-041-4/+8
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | 52dbfefe0d Xcode: Fix detection of Swift compiler location for Xcode 14.3 Merge-request: !8388
| * | | Xcode: Fix detection of Swift compiler location for Xcode 14.3Brad King2023-04-031-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we tried to match output from `xcodebuild` to detect the path to the `swiftc` tool. This approach is used for C and CXX for historical reasons, but is unnecessary for Swift. We know the name of the tool, so we can just ask `xcrun --find swiftc`. Fixes: #24666
* | | | Merge topic 'vs-fortran-try_compile'Brad King2023-04-031-1/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 4da50fe3f4 VS: Remove extra try_compile argument in Intel Fortran check Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8383
| * | | VS: Remove extra try_compile argument in Intel Fortran checkBrad King2023-03-311-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit d00d8537f6 (Modules: Use new keyword-dispatched try_compile signature, 2022-09-16, v3.25.0-rc1~115^2) accidentally left one of the old signature arguments behind, causing a warning.
| * | | CompilerId: Restore logging of failed identifications in CMake 3.25Brad King2023-03-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in commit 9c5bd7fe3a (CompilerId: Output errors from all attempts at detection, 2022-08-16, v3.25.0-rc1~290^2) accidentally stopped logging failed compiler identification build output. This was fixed for CMake 3.26 and later by commit 24ccc8c3c9 (CompilerId: Restore logging of failed identifications, 2023-01-16, v3.26.0-rc1~70^2~6). Backport it to 3.25.
| * | | Merge branch 'GoogleTest-type-param-suite' into release-3.25Brad King2023-03-031-1/+1
| |\ \ \ | | |/ / | | | | | | | | Merge-request: !8282
* | | | Merge topic 'remove-FindPythonInterp-FindPythonLibs'Brad King2023-03-312-0/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4c5b91f80 FindPython{Interp,Libs}: Add policy to remove these modules Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: scivision <michael@scivision.dev> Merge-request: !8380
| * | | | FindPython{Interp,Libs}: Add policy to remove these modulesBrad King2023-03-302-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `FindPythonInterp` and `FindPythonLibs` modules have been deprecated since CMake 3.12. Add a policy to pretend they do not exist in order to encourage projects to port to `FindPython` or `FindPython{2,3}`.
* | | | | Merge topic 'binutils-strip-macos'Brad King2023-03-311-1/+9
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | ac2562afb3 BinUtils: Avoid llvm-strip on Apple platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8372
| * | | | BinUtils: Avoid llvm-strip on Apple platformsBrad King2023-03-301-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit cf82300a63 (BinUtils: Clarify search logic and make it more consistent, 2021-05-27, v3.21.0-rc1~119^2~2) we prefer `llvm-strip` over `strip` when using Clang. However, `llvm-strip` seems to produce unusable binaries in cases involving chained fixups. Prefer Apple's `strip` over `llvm-strip` on `APPLE` platforms. We still need to consider `llvm-strip` as a fallback as explained for `llvm-ar` by commit fee36b7a78 (BinUtils: Restore llvm-ar fallback on Apple platforms, 2022-03-15, v3.23.0-rc4~12^2). Issue: #24601
* | | | | Merge topic 'ci-FindHDF5'Brad King2023-03-301-19/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d38c752de2 ci: Enable FindHDF5 tests on Linux builds 28c4945a8a ci: Add HDF5 to Debian and Fedora base images ad9e151045 Tests: Add cases covering FindHDF5 variables and imported targets 0e87e6c1a4 Tests: Add FindMPI test environment modification option ee075a53c8 FindHDF5: Record compiler wrapper checks to configure log 72915b1068 FindHDF5: Fix compiler wrapper checks with spaces in path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8378
| * | | | | FindHDF5: Record compiler wrapper checks to configure logBrad King2023-03-291-9/+21
| | | | | |
| * | | | | FindHDF5: Fix compiler wrapper checks with spaces in pathBrad King2023-03-291-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some HDF5 compiler wrappers do not support source file paths that contain spaces. Pass source files to them using a file name in the current working directory to avoid spaces.
* | | | | | Merge topic 'FindOpenAL-framework'Brad King2023-03-301-12/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f05bd762f5 ci: Enable FindOpenAL test on macOS jobs 1d06554fc6 Tests: Fix FindOpenAL test for macOS framework 5f5476ee31 FindOpenAL: Fix imported target for macOS framework Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8373
| * | | | | FindOpenAL: Fix imported target for macOS frameworknega2023-03-291-12/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | If a framework is found, specify it through `INTERFACE_LINK_LIBRARIES` because `IMPORTED_LOCATION` requires a file and not a framework directory.
* | | | | Merge topic 'swift-old-driver'Brad King2023-03-293-3/+72
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | 006e1995eb Swift: Restore compatibility with old C++ driver Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8365
| * | | Swift: Restore compatibility with old C++ driverYR Chen2023-03-283-3/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `-wmo` flag added by commit 6063428de7 (Swift: Update default build flags, 2022-10-03, v3.26.0-rc1~585^2~1) behaves differently with the old driver. Detect when the old driver is being used, and avoid adding that flag. Fixes: #24641
* | | | Merge topic 'FindPython-Windows-ARM'Brad King2023-03-281-26/+84
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9913c28ebb FindPython: Add Windows/ARM support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: David Lechner <david@lechnology.com> Merge-request: !8354
| * | | | FindPython: Add Windows/ARM supportMarc Chevrier2023-03-261-26/+84
| | | | | | | | | | | | | | | | | | | | Fixes: #24587
* | | | | Merge topic 'crosscompiling-warn-reset'Brad King2023-03-271-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d23636694 Warn if CMAKE_CROSSCOMPILING is true without CMAKE_SYSTEM_NAME set Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8358