summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'android-path-suffixes'Brad King2022-10-191-0/+6
|\ | | | | | | | | | | | | 7e5b48a7b1 Android: Avoid searching API level directories matching architecture bitness Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7805
| * Android: Avoid searching API level directories matching architecture bitnessSergiu Deitsch2022-10-181-0/+6
| | | | | | | | | | | | | | | | | | When cross-compiling for Android, the library path suffixes `/<number>/` refer to API level specific platform libraries instead of architecture bitness. Disable path suffix use under NDK to avoid incorrect inclusion of API level specific libraries below the targeted API level. Fixes: #23830
* | Merge topic 'FindJNI-android-api'Brad King2022-10-181-2/+2
|\ \ | |/ | | | | | | | | | | c833df0924 FindJNI: replace CMAKE_ANDROID_API by CMAKE_SYSTEM_VERSION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7801
| * FindJNI: replace CMAKE_ANDROID_API by CMAKE_SYSTEM_VERSIONSergiu Deitsch2022-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 00c4f488f2 (FindJNI: support Android NDK, 2022-03-18, v3.24.0-rc1~325^2) we used `CMAKE_ANDROID_API` to check the Android API level. However, `CMAKE_SYSTEM_VERSION` is the authoritative value. When cross-compiling for Android, an unset `CMAKE_ANDROID_API` can result in failure to locate JNI because the `NativeHelper` component cannot be found. In this case, the component is falsely assumed to be available by default (and thus required) since the comparison against an unset `CMAKE_ANDROID_API` variable evaluates to true. Use `CMAKE_SYSTEM_VERSION` to determine the Android API level instead. Issue: #23830
* | Merge topic 'serenityos-no-libdl'Brad King2022-10-181-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 4fa0d157bc SerenityOS: Unset CMAKE_DL_LIBS because LibDl no longer exists Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7797
| * | SerenityOS: Unset CMAKE_DL_LIBS because LibDl no longer existsAndrew Kaster2022-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Serenity's LibDl was merged into LibC to simplify the build and port infrastructure [1]. Set `CMAKE_DL_LIBS` to the empty string to match what other platforms do. Update the platform module added by commit 45ca894164 (SerenityOS: Add Platform module, 2022-01-02, v3.25.0-rc1~635^2). [1] https://github.com/SerenityOS/serenity/pull/14854 Issue: #23589
* | | Merge topic 'revert_nvcc_marking_include_as_system'Brad King2022-10-181-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d0e52219eb CUDA: Revert "Always mark cuda toolkit as system include" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7798
| * | | CUDA: Revert "Always mark cuda toolkit as system include"Robert Maynard2022-10-171-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | We need to revert this change as it can disable error messages when compiling invalid CUDA code. This reverts commit ea659b155d (CUDA: Always mark cuda toolkit as system include, 2022-06-27, v3.25.0-rc1~269^2).
* | | Merge topic 'UseSWIG-perl5-language'Brad King2022-10-171-3/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 989b469f1c UseSWIG: Add support of perl5 language Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7794
| * | | UseSWIG: Add support of perl5 languageMarc Chevrier2022-10-141-3/+4
| | | |
* | | | Merge topic 'swift-default-flags'Brad King2022-10-171-7/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 238e0f25b2 Xcode: Set WMO on non-debug build configurations 6063428de7 Swift: Update default build flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7741
| * | | | Swift: Update default build flagsEvan Wilde2022-10-111-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fully-optimized builds should be using whole-module optimizations(WMO) to get all the optimizations the compiler can do for a given module. As such, it makes sense for the release builds to pass `-whole-module-optimization` or `-wmo` to the compiler by default. `-whole-module-optimization` and `-wmo` are aliased and have the same impact on the build. Removing `-incrementa' from the `CMAKE_Swift_CREATE_*` variable: WMO is incompatible with incremental builds, so it is removed to avoid warnings from the Swift compiler. Pass `-num-threads` to the driver in `CMAKE_Swift_CREATE_*`: WMO doesn't use the `-j` flag, but instead uses `-num-threads` to get parallelism. The two flags are applied in mutually exclusive contexts, so `-j N` is a no-op in WMO, while `-num-threads` is a no-op in other modes. Passing both at the same time will catch both cases without negatively impacting the other case.
* | | | | Merge topic 'FindZLIB-no-components'Brad King2022-10-141-1/+10
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | cf612440dc FindZLIB: Fail if components are requested as it does not provide any Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7767
| * | | | FindZLIB: Fail if components are requested as it does not provide anykoostosh2022-10-121-1/+10
| |/ / / | | | | | | | | | | | | Fixes: #18872
* | | | FindGLUT: Drop the now-unnecessary exclusion of pkg-config for multiconfigleha-bot2022-10-131-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit e0a62b84b5 (FindGLUT: On Windows and with multiple config generator do not use pkg-config, 2022-09-27, v3.25.0-rc1~69^2). We now call `select_library_configurations()` even after using pkg-config, which will handle the absent libraries on Debug/Release configurations. Issue: #24028
* | | | FindGLUT: Drop the now-unnecessary ALLOW_SYSTEM_CFLAGS logicleha-bot2022-10-131-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 8041ca5df0 (FindGLUT: Fix GLUT_INCLUDE_DIRS with pkg-config and /usr/include, 2022-05-11, v3.24.0-rc1~151^2). As the main code path will always do `find_path()` which respects the `CMAKE_FIND_ROOT_PATH_MODE_INCLUDE` variable and will search in system paths depending on that variable. Issue: #23474, #24028
* | | | FindGLUT: Use pkg-config's results as HINTS for normal searchleha-bot2022-10-131-41/+19
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f90d15458a (FindGLUT: Use pkg-config to find flags if available, 2021-06-11, v3.22.0-rc1~469^2), pkg-config results are used directly. However, this is not compatible with other features of CMake's find logic such as `CMAKE_FIND_ROOT_PATH` and per-config results. Switch to a convention already used by pkg-config support in other find modules, in which the pkg-config results are only used as hints for the main search logic. Fixes: #24028
* | | FindCUDAToolkit: cuFile_rdma_static needs to link to cuFile_staticRobert Maynard2022-10-121-1/+1
| | |
* | | Merge topic 'GoogleTest-TYPED_TEST_P' into release-3.25Brad King2022-10-121-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d340d7cb2 GoogleTest: Add gtest-filter for TYPED_TEST_P Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7778
| * | | GoogleTest: Add gtest-filter for TYPED_TEST_POleksii Odynochenko2022-10-111-2/+4
| | | |
* | | | Merge topic 'add_nvptx_compiler_to_findCUDAToolkit' into release-3.25Brad King2022-10-121-0/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01cfd0163d FindCUDAToolkit: Add support for the nvptx compiler library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7779
| * | | | FindCUDAToolkit: Add support for the nvptx compiler libraryRobert Maynard2022-10-111-0/+20
| | | | | | | | | | | | | | | | | | | | Fixes #23892
* | | | | Merge topic 'add_cufile_to_findCUDAToolkit' into release-3.25Brad King2022-10-121-0/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce6de038d9 FindCUDAToolkit: Add support for the cuFile library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7763
| * | | | | FindCUDAToolkit: Add support for the cuFile libraryRobert Maynard2022-10-111-0/+25
| | | | | |
* | | | | | Merge topic 'flang-implicit-link-info' into release-3.25Brad King2022-10-121-0/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | 0301779e85 LLVMFlang: Add support for mixed-language linking with Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7781
| * | | | LLVMFlang: Add support for mixed-language linking with FortranBrad King2022-10-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parse implicit link information for this compiler to support mixed-language linking. This was missed by commit 85749766df (LLVMFlang: Add support for LLVM Flang, 2021-07-07, v3.24.0-rc1~86^2). Also activate mixed-language test cases that would have caught this. Issue: #22387
| * | | | Merge branch 'cpack-nsis-uninstaller' into release-3.24Brad King2022-10-111-5/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !7774
| * \ \ \ \ Merge topic 'add_cuda_11.8_new_archs' into release-3.24Brad King2022-10-101-0/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f4cbf6594 CUDA: Add support for the two new architectures in 11.8 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7761
* | \ \ \ \ \ Merge topic 'doc-3.25-relnotes'Brad King2022-10-111-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 286a40cb5b Help: Update Sphinx versionadded directives for 3.25 release f93f97d6c2 Help: Organize and revise 3.25 release notes c174ef23f4 Help: Consolidate 3.25 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7751
| * | | | | | | Help: Update Sphinx versionadded directives for 3.25 releaseBrad King2022-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the script: Utilities/Sphinx/update_versions.py --since v3.24.0 --overwrite Manually de-duplicate the directive in FindOpenSP.
* | | | | | | | Merge topic 'ifw-missing-patch-releases'Brad King2022-10-111-12/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de6764126a CPackIFW: Add support for missing QtIFW patch and minor releases Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7765
| * | | | | | | | CPackIFW: Add support for missing QtIFW patch and minor releasesErlend E. Aasland2022-10-101-12/+30
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #24035
* | | | | | | | Merge topic 'hip_windows_platform_module'Brad King2022-10-112-15/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b87ae6e2d HIP, Windows: Add Windows-Clang-HIP platform module Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7773
| * | | | | | | | HIP, Windows: Add Windows-Clang-HIP platform moduleGergely Meszaros2022-10-092-15/+49
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a platform module for using clang for HIP on windows, based on the CXX module. HIP language on windows works without this, but mixing with MSVC produces catastrofical results. Add the same restriction with HIP as C and C++ had prior: Either none are compiled with MSVC or all are. clang-cl support for HIP does not work yet: it needs more work in both hip-lang-config.cmake and cmake itself.
* | | | | | | | Merge topic 'required_hip_lang_package'Brad King2022-10-111-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22051103b8 HIP: Find hip-lang-config.cmake with REQUIRED Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7771
| * | | | | | | | HIP: Find hip-lang-config.cmake with REQUIREDGergely Meszaros2022-10-091-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use REQUIRED for the find_package that loads the hip config, because it may fail, e.g. because dependent libraries are not found. Before this if the find_package failed cmake silently continued.
* | | | | | | | Merge topic 'hip_use_cmake_path'Brad King2022-10-111-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6021fa7928 HIP: Convert clang output to cmake style paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7772
| * | | | | | | | HIP: Convert clang output to cmake style pathsGergely Meszaros2022-10-091-0/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On windows the location of the rocm root directory as reported by clang might be in windows style (with backslashes) which breaks the cache.
* | | | | | | | Merge topic 'cpack-nsis-uninstaller'Brad King2022-10-111-5/+14
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | 8721658959 CPack/NSIS: Fix installer not waiting for uninstaller to finish Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7774
| * | | | | | CPack/NSIS: Fix installer not waiting for uninstaller to finishMika Fischer2022-10-101-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit b795c96727 (CPack/NSIS: Fix uninstall command when run from installer, 2022-03-21, v3.23.0-rc5~9^2~1) we incorrectly removed the `_?` parameter when calling the uninstaller during installation. This parameter is however essential for ExecWait to actually wait for the uninstaller to finish. Without it, the uninstaller is started in the background and installer and uninstaller run at the same time. See https://nsis.sourceforge.io/Docs/Chapter3.html#installerusageuninstaller Add back the `_?` parameter to fix this regression. Use another approach to solve the problem motivating the original change. Fixes: #24041
| * | | | | | Merge branch 'findCUDAToolkit_declare_deps_for_targets_once' into release-3.23Brad King2022-09-061-17/+20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !7633
* | \ \ \ \ \ \ Merge topic 'add_cuda_11.8_new_archs'Brad King2022-10-101-0/+6
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f4cbf6594 CUDA: Add support for the two new architectures in 11.8 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7761
| * | | | | | | CUDA: Add support for the two new architectures in 11.8Robert Maynard2022-10-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CUDA 11.8 introduces ada ( 89 ), and hopper ( 90 ).
* | | | | | | | Merge topic 'Intel-Fortran-warn-errors'Brad King2022-10-104-8/+22
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13f3382b1c Intel/IntelLLVM: Fortran has distinct "-Werror"-like flag ab8a0a106e COMPILE_WARNING_AS_ERROR: Fix internal formatting of options table Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7758
| * | | | | | Intel/IntelLLVM: Fortran has distinct "-Werror"-like flagMichael Hirsch2022-10-072-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the compiler options table added by commit 76a08cd253 (COMPILE_WARNING_AS_ERROR: Add options to treat warnings as errors, 2022-04-21, v3.24.0-rc1~173^2) to use the Intel Fortran compilers' dedicated `-warn*` flags.
| * | | | | | COMPILE_WARNING_AS_ERROR: Fix internal formatting of options tableBrad King2022-10-072-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 76a08cd253 (COMPILE_WARNING_AS_ERROR: Add options to treat warnings as errors, 2022-04-21, v3.24.0-rc1~173^2) we formatted the options table entries as command-line string fragments. Since they are part of the `CMAKE_${lang}_COMPILE_OPTIONS_*` tables, they should be formatted as `;`-separated lists of compiler options.
* | | | | | Merge topic 'Tasking-regex-fix'Brad King2022-10-071-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b03fecb8f Tasking: Simplify processor list matching regex Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7752
| * | | | | Tasking: Simplify processor list matching regexHutchings Samuel (ETAS/ERS-PRM)2022-10-071-2/+2
| | | | | |
* | | | | | Merge topic 'ifw-4.4'Brad King2022-10-061-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | e848ce21c9 CPack/IFW: Add support for QtIFW 4.4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7750
| * | | | CPack/IFW: Add support for QtIFW 4.4Erlend E. Aasland2022-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | Fixes: #24027