summaryrefslogtreecommitdiff
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* ASM_MARMASM: Populate MSVC debug information format abstraction tableBrad King2022-12-151-0/+4
| | | | | | | | | | | | | | | In commit 3166547cf6 (ASM_MARMASM: Add support for Microsoft ARM assembler language, 2022-10-14) we overlooked populating the runtime library selection flags for the Microsoft ARM assembler, needed since commit 0e96a20478 (MSVC: Add abstraction for debug information format, 2022-08-25, v3.25.0-rc1~142^2~1). Its compiler id is `MSVC`, so our generators expect the table to be populated. It only supports `Embedded` debug info. Use empty flags for the other formats. Without this fix, enabling the `ASM_MARMASM` language with policy `CMP0141` set to `NEW` causes an error due to the missing table entries. Issue: #24249
* Merge branch 'backport-masm-debug-format' into masm-debug-formatBrad King2022-12-151-0/+4
|\
| * ASM_MASM: Populate MSVC debug information format abstraction tableBrad King2022-12-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 0e96a20478 (MSVC: Add abstraction for debug information format, 2022-08-25, v3.25.0-rc1~142^2~1) we overlooked populating the runtime library selection flags for the Microsoft assembler. Its compiler id is `MSVC`, so our generators expect the table to be populated. It only supports `Embedded` debug info. Use empty flags for the other formats. Without this fix, enabling the `ASM_MASM` language with policy `CMP0141` set to `NEW` causes an error due to the missing table entries. Fixes: #24249
* | Merge topic 'find_cudatoolkit_add_nvjitlink'Brad King2022-12-141-0/+17
|\ \ | | | | | | | | | | | | | | | | | | d37d9c098c FindCUDAToolkit: Support the new `nvJitLink` library in CUDA 12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8014
| * | FindCUDAToolkit: Support the new `nvJitLink` library in CUDA 12Robert Maynard2022-12-121-0/+17
| | |
* | | Merge topic 'cuda-nvcc-cuda20'Brad King2022-12-141-0/+12
|\ \ \ | |/ / |/| / | |/ | | | | | | 0aeeb8160c CUDA: Add support for cuda_std_20 for nvcc 12.0+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8008
| * CUDA: Add support for cuda_std_20 for nvcc 12.0+Robert Maynard2022-12-131-0/+12
| | | | | | | | CUDA 12.0 has been released with support for `-std=c++20`.
| * Merge topic 'CheckSymbolExists-restore-newline' into release-3.25Brad King2022-12-051-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | 9273b8f421 CheckSymbolExists: Restore newline at end of test source Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Petr Nechaev <petr.nechaev@cogentembedded.com> Merge-request: !7979
* | \ Merge topic 'FindOpenSSL-static-z'Brad King2022-12-061-4/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b7804edd0 FindOpenSSL: use extra dependencies from pkg-config as well Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7986
| * | | FindOpenSSL: use extra dependencies from pkg-config as wellRolf Eike Beer2022-12-051-4/+38
| | | | | | | | | | | | | | | | This is important if OpenSSL is linked against an external zlib.
* | | | Merge topic 'cxx-module-map-clang'Brad King2022-12-061-0/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c558cfd1b gitlab-ci: add CI jobs for Clang with C++20 modules abd42e9cfc ci: add a Docker container for clang support of C++20 modules 51093f3002 Clang-FindBinUtils: also find `clang-scan-deps` 0b333de923 ci: add C++ module rules file for Clang 21b9fb1e8c cmCxxModuleMapper: support the `clang` module map format 9c66224668 cmNinjaTargetGenerator: skip setting `depfile` for `none` scantypes 9123a0991f cmNinjaTargetGenerator: use `.clear()` to empty out some strings Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Cristian Adam <cristian.adam@gmail.com> Merge-request: !7978
| * | | | Clang-FindBinUtils: also find `clang-scan-deps`Ben Boeckel2022-12-021-0/+11
| | | | | | | | | | | | | | | | | | | | `clang-scan-deps` will be required for C++20 module scanning purposes.
* | | | | Merge topic 'CheckSymbolExists-restore-newline'Brad King2022-12-051-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | 9273b8f421 CheckSymbolExists: Restore newline at end of test source Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Petr Nechaev <petr.nechaev@cogentembedded.com> Merge-request: !7979
| * | | CheckSymbolExists: Restore newline at end of test sourceAndrey Vostrikov2022-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit db76876db5 (Modules: Use new SOURCES_FROM_* try_compile (1/2), 2022-09-26, v3.25.0-rc1~74^2~1) accidentally dropped the final newline of the test source, which was previously provided by the input to `configure_file`. The C standard requires a newline at the end of file, so add one explicitly. Signed-off-by: Andrey Vostrikov <andrey.vostrikov@cogentembedded.com>
* | | | Merge topic 'FetchContent-SYSTEM'Craig Scott2022-12-051-0/+3
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | 4b85141f83 FetchContent: Don't pass SYSTEM through to sub-build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7977
| * | FetchContent: Don't pass SYSTEM through to sub-buildCraig Scott2022-12-021-0/+3
| |/ | | | | | | | | | | | | | | | | If we don't filter out SYSTEM from the arguments we pass through to ExternalProject_Add(), it gets appended as a list item to whatever arguments precede it because ExternalProject_Add() doesn't recognize it as a keyword. Fixes: #24201
| * Merge topic 'source-from-var' into release-3.25Brad King2022-11-292-4/+6
| |\ | | | | | | | | | | | | | | | | | | f6b99c5087 Check*: Restore support for arbitrary result variable names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7960
| * \ Merge topic 'FindRuby-doc-fix' into release-3.25Brad King2022-11-291-3/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 0d7f40a5c4 FindRuby: Remove documentation for non-existent Ruby_ROOT_DIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7954
| * \ \ Merge topic 'android-no-LINUX' into release-3.25Brad King2022-11-291-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19509249a5 Android: Revert setting LINUX variable on Android target systems Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Nevala <robert.nevala@king.com> Acked-by: n00b42 <github.com@mail.msdigital.de> Merge-request: !7963
| * \ \ \ Merge topic 'msvc-cxx-no-optin-experimental-flag' into release-3.25Brad King2022-11-291-1/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12e4bc73cb MSVC: don't opt into dyndep support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7965
| * \ \ \ \ Merge topic 'revert-find_library-msvc-libfoo.a' into release-3.25Brad King2022-11-291-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 955d6245c1 MSVC: Revert "Teach find_library to consider the 'libfoo.a' naming convention" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7962
| * \ \ \ \ \ Merge topic 'mingw-windres' into release-3.25Brad King2022-11-292-7/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b47092fddb MinGW: Fix regression when windres is not found Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7964
* | \ \ \ \ \ \ Merge topic 'find_cudatoolkit_avoid_nvhpc_symlinks'Brad King2022-12-011-7/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d012b1f69 FindCUDAToolkit: Ensure that paths provided have no symlinks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7974
| * | | | | | | | FindCUDAToolkit: Ensure that paths provided have no symlinksRobert Maynard2022-11-301-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #24188
* | | | | | | | | Merge topic 'watcom-win16'Brad King2022-12-011-9/+38
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef9ce3aadb OpenWatcom: Add support for 16-bit Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7975
| * | | | | | | | | OpenWatcom: Add support for 16-bit Windowsjbs2022-11-301-9/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for NE Win16 binaries. We already support 16-bit DOS and OS/2.
* | | | | | | | | | Merge topic 'msys-pkgconf'Brad King2022-12-012-7/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 903ae3c71b MSYS Makefiles: Modernize search paths for common MSYS 'make' locations 2057066e05 FindMsys: Modernize search paths for common MSYS locations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7955
| * | | | | | | | | MSYS Makefiles: Modernize search paths for common MSYS 'make' locationsZiemowit Łąski2022-11-301-3/+8
| | | | | | | | | |
| * | | | | | | | | FindMsys: Modernize search paths for common MSYS locationsZiemowit Łąski2022-11-301-4/+5
| | | | | | | | | |
* | | | | | | | | | FindPython: add support for Stable ABIMarc Chevrier2022-11-293-96/+791
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #24141
* | | | | | | | | Merge topic 'iar-rsp-on-objects'Brad King2022-11-291-22/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a51e01f2ec IAR: Add response flag for files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7957
| * | | | | | | | | IAR: Add response flag for filesFelipe Torrezan2022-11-271-22/+16
| |/ / / / / / / /
* | | | | | | | | Merge topic 'source-from-var'Brad King2022-11-292-4/+6
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6b99c5087 Check*: Restore support for arbitrary result variable names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7960
| * | | | | | | | Check*: Restore support for arbitrary result variable namesZhong Ruoyu2022-11-282-4/+6
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit db76876db5 (Modules: Use new SOURCES_FROM_* try_compile (1/2), 2022-09-26, v3.25.0-rc1~74^2~1) and commit 41f7b1169a (Modules: Use new SOURCES_FROM_* try_compile (2/2), 2022-09-26, v3.25.0-rc1~74^2) the switch to `SOURCE_FROM_*` required a stronger precondition (the second argument to check_include_files must not have path components) than before (any variable name could be used). Fix that by transforming the variable name to a C identifier before feeding it to try_compile as a filename. The filename is unspecified by the documentation, and the file itself is only temporary, so that should work fine. I have gone through all the occurrences of `SOURCE_FROM_*`, and identified these two that require changes. The rest should work fine as the filenames do not depend on input variable names. Fixes: #24204
* | | | | | | | Merge topic 'FindRuby-doc-fix'Brad King2022-11-291-3/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d7f40a5c4 FindRuby: Remove documentation for non-existent Ruby_ROOT_DIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7954
| * | | | | | | FindRuby: Remove documentation for non-existent Ruby_ROOT_DIRHannes Braun2022-11-281-3/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation was added by commit 905d5667e8 (FindRuby: Add support for RVM installations, 2020-03-23, v3.18.0-rc1~497^2), but this feature was never implemented. Closes: #21528
* | | | | | | Merge topic 'android-no-LINUX'Brad King2022-11-291-0/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19509249a5 Android: Revert setting LINUX variable on Android target systems Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Nevala <robert.nevala@king.com> Acked-by: n00b42 <github.com@mail.msdigital.de> Merge-request: !7963
| * | | | | | Android: Revert setting LINUX variable on Android target systemsBrad King2022-11-281-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 62cd3904bf (variable: Set LINUX variable on Linux target systems, 2022-08-10, v3.25.0-rc1~320^2), the `Platform/Android` module inherits the `LINUX` variable setting from `Platform/Linux`. While Android may use a Linux kernel, `CMAKE_SYSTEM_NAME` is not `Linux`, and the platform does not follow conventions of most Linux distributions. Fixes: #24196
* | | | | | Merge topic 'msvc-cxx-no-optin-experimental-flag'Brad King2022-11-291-1/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12e4bc73cb MSVC: don't opt into dyndep support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7965
| * | | | | MSVC: don't opt into dyndep supportBen Boeckel2022-11-281-1/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, just set the variables for how scanning works since that is part of the compiler mechanisms. Fixes: #24198
* | | | | Merge topic 'revert-find_library-msvc-libfoo.a'Brad King2022-11-291-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 955d6245c1 MSVC: Revert "Teach find_library to consider the 'libfoo.a' naming convention" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7962
| * | | | MSVC: Revert "Teach find_library to consider the 'libfoo.a' naming convention"Brad King2022-11-281-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit be848a71b0 (MSVC: Teach find_library to consider the 'libfoo.a' naming convention, 2022-09-19, v3.25.0-rc1~111^2). When targeting the MSVC ABI, this causes GNU-ABI libraries to be found in cases they were not previously, and broke existing builds. Revert the change pending further discussion on how to handle the motivating use case. Issue: #23975 Fixes: #24168
* | | | Merge topic 'mingw-windres'Brad King2022-11-292-7/+11
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | b47092fddb MinGW: Fix regression when windres is not found Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7964
| * | MinGW: Fix regression when windres is not foundBrad King2022-11-282-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit e9755bc7c1 (MinGW: Restore using windres when toolchain-prefixed name is not available, 2022-08-15, v3.24.1~4^2) incorrectly listed two entries in `CMAKE_RC_COMPILER_INIT`, which is only meant to have one value. Revise the logic to support multiple platform-specific names for the Windows Resource Compiler while still only using one name as the fallback when it is not found. Fixes: #24190 Issue: #23841
* | | Merge topic 'find_cuda_toolkit_support_symlink_math_dirs'Brad King2022-11-231-3/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 989d50d7fc FindCUDAToolkit: Support nvhpc splayed layouts without symlinks 207518b6e8 FindCUDAToolkit: Handle CUDAToolkit_TARGET_DIR dir being a symlink Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7945
| * | | FindCUDAToolkit: Support nvhpc splayed layouts without symlinksRobert Maynard2022-11-221-2/+8
| | | |
| * | | FindCUDAToolkit: Handle CUDAToolkit_TARGET_DIR dir being a symlinkRobert Maynard2022-11-181-2/+3
| | | |
* | | | Merge topic 'find_dependency-dedup'Brad King2022-11-221-25/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb9a3d0c7d find_dependency: Avoid repeating identical dependency searches 5fbda0f572 find_dependency: Unset temporary variables before returning 591b75ee17 Tests: Add case covering transitive find_dependency calls Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7936
| * | | | find_dependency: Avoid repeating identical dependency searchesBrad King2022-11-181-26/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 37da6af17d (find_dependency: Always search dependencies, 2019-03-29, v3.15.0-rc1~301^2) we search for a package every time it is encountered in the transitive dependency graph traversal, even if it has been found before. This was done in case a new visit to a given package requests different components than a previous visit. However, it also causes a lot of repeat processing that is unnecessary in the common case that all calls share the same set of components (often none). Restore the logic to avoid repeating the search for an already-found package. Handle differences in components by de-duplicating based on the complete `find_package` call arguments. Fixes: #23685
| * | | | find_dependency: Unset temporary variables before returningBrad King2022-11-181-2/+3
| | | | |