summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* CPack/IFW: Add support for QtIFW 4.5Erlend E. Aasland2022-11-151-0/+2
| | | | Fixes: #24164
* Merge topic 'msvc-19.34-cpp-modules' into release-3.25Brad King2022-11-141-0/+12
|\ | | | | | | | | | | | | | | 0e9782b336 msvc: bless MSVC 19.34 support for C++ modules as experimental Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7745
| * msvc: bless MSVC 19.34 support for C++ modules as experimentalBen Boeckel2022-11-111-0/+12
| | | | | | | | Visual Studio 17.4 now contains official support for what CMake needs.
* | IAR: Fix ASM compiler architecture detectionFelipe Torrezan2022-11-111-4/+3
|/ | | | | | | Narrow the regex to match the actual supported architectures, avoiding mismatched detection. Fixes: #24145
* Merge topic 'sphinx-linkcheck' into release-3.25Brad King2022-11-0817-32/+32
|\ | | | | | | | | | | | | | | 435b0c573c Help: Fix some redirects reported with sphinx linkcheck ac5295a9de Help: Fix broken external links found by sphinx linkcheck Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7876
| * Help: Fix some redirects reported with sphinx linkcheckAlex Turbov2022-11-0714-28/+29
| | | | | | | | Mostly it's about replace `http:` with `https:` protocol.
| * Help: Fix broken external links found by sphinx linkcheckAlex Turbov2022-11-073-4/+3
| |
* | Merge topic 'FindOpenSSL-mingw-lib64' into release-3.25Brad King2022-11-081-0/+2
|\ \ | | | | | | | | | | | | | | | | | | ed24414eee FindOpenSSL: Search "lib64" for mingw 64-bit installs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7875
| * | FindOpenSSL: Search "lib64" for mingw 64-bit installsklytje2022-11-071-0/+2
| |/
* | Tasking: Remove CMAKE_SYSTEM_PROCESSOR support per CMP0123Christoph Seitz2022-11-071-32/+0
|/ | | | | | | Architecture specific compile options should be set through toolchain files. Fixes: #24115
* Merge topic 'tasking-pic' into release-3.25Brad King2022-11-041-1/+1
|\ | | | | | | | | | | | | | | 7e612977b9 Tasking: Fix PIC option for Tasking Toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Christoph Seitz <christoph.seitz@posteo.de> Merge-request: !7862
| * Tasking: Fix PIC option for Tasking ToolsetGordon Jess2022-11-031-1/+1
| | | | | | | | Fixes: #24114
* | Merge topic 'correct_nvptxcompiler_not_linking_to_threads' into release-3.25Brad King2022-11-031-2/+4
|\ \ | |/ |/| | | | | | | | | 62f13ed588 FindCUDAToolkit: Restore usage from multiple directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7859
| * FindCUDAToolkit: Restore usage from multiple directoriesRobert Maynard2022-11-021-2/+4
| | | | | | | | Fixes #24119
* | IAR: Restore support for CMAKE_CXX_FLAGS_INITDaniel Schürmann2022-11-011-2/+2
|/ | | | | | | | | | | | Prior to commit a9073db736 (IAR: update language specification detection, 2021-09-23, v3.22.0-rc1~83^2) the `--c++`/`--eec++` flags were stored in `CMAKE_IAR_CXX_FLAG` so that they would be used as part of the `CMAKE_CXX_COMPILE_OBJECT` rule variable. That commit moved the flags to `CMAKE_CXX_FLAGS`, which also broke initialization of `CMAKE_CXX_FLAGS` from `CMAKE_CXX_FLAGS_INIT`. Restore the original approach. Fixes: #24111
* FindCUDAToolkit: Add nvptxcompiler_static dependency on Threads::ThreadsRobert Maynard2022-10-311-1/+2
|
* Merge topic 'ArchLinux-lib-dir' into release-3.25Brad King2022-10-311-3/+8
|\ | | | | | | | | | | | | | | 988b9928e4 Linux: Avoid finding libraries using lib64 on ArchLinux Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Felix Yan <felixonmars@archlinux.org> Merge-request: !7849
| * Linux: Avoid finding libraries using lib64 on ArchLinuxLetu Ren2022-10-301-3/+8
| | | | | | | | | | ArchLinux uses `/lib` for 64-bit libraries and there is no `/lib64`. However, unlike Debian, 32-bit libraries are in `/lib32`.
* | Ninja: Match showIncludes dependencies using console output code pageBrad King2022-10-301-1/+1
|/ | | | | | | | | Generalize the fix from commit 37a279f8d1 (Ninja: Write msvc_deps_prefix as UTF-8 when console codepage is UTF-8, 2020-07-31, v3.19.0-rc1~349^2). `cl /showIncludes` output is encoded using the console output code page, so this is the byte sequence that Ninja must use to match its lines. Fixes: #24068
* FindGLUT: Fix regression when pkg-config is not availableBrad King2022-10-271-3/+5
| | | | | | | | | In commit a2fc4b6257 (FindGLUT: Drop the now-unnecessary exclusion of pkg-config for multiconfig, 2022-10-13, v3.25.0-rc2~16^2) we accidentally removed the entire condition around the `pkg-config` code path instead of just the multi-config part. Fixes: #24095
* Merge topic 'nsis-licence-bom' into release-3.25Brad King2022-10-251-1/+2
|\ | | | | | | | | | | | | b276d9d8f1 CPack/NSIS: Document BOM mark for UTF-8 encoded LICENSE file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7820
| * CPack/NSIS: Document BOM mark for UTF-8 encoded LICENSE fileMojca Miklavec2022-10-241-1/+2
| | | | | | | | | | Previously this requirement was only mentioned in the 3.20 release notes.
* | Merge topic 'flang-windows' into release-3.25Brad King2022-10-251-0/+1
|\ \ | |/ |/| | | | | | | | | 166bc00399 LLVMFlang: Add a required line to define linking rules on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7818
| * LLVMFlang: Add a required line to define linking rules on Windowsمهدي شينون (Mehdi Chinoune)2022-10-241-0/+1
| | | | | | | | | | This was missed in commit d34e5a98b8 (LLVMFlang: Add support for Windows, 2022-09-18, v3.25.0-rc1~102^2).
* | Help: Add more CLI `:option:` references to various pagesAlex Turbov2022-10-201-1/+1
| |
* | Merge topic 'android-path-suffixes' into release-3.25Brad 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' into release-3.25Brad 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' into release-3.25Brad 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
* | | 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).
* | 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