summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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-292-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
| | | | |
* | | | | Merge topic 'opencl_framework'Brad King2022-11-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e2c1e3ea5 OpenCL: Do not assume that OpenCL framework is always used in Apple Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7941
| * | | | | OpenCL: Do not assume that OpenCL framework is always used in AppleIsuru Fernando2022-11-201-1/+1
| |/ / / /
* | | | | Merge topic 'FindCUDA-nppicom'Brad King2022-11-221-1/+3
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | 3ddfdc38eb FindCUDA: Do not use CUDA_nppicom_LIBRARY in CUDA 11.0+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7938
| * | | FindCUDA: Do not use CUDA_nppicom_LIBRARY in CUDA 11.0+Oleksii Udod2022-11-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the change from commit 1d9f2f9714 (FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11, 2020-06-22, v3.18.0-rc3~14^2) to also not use the `CUDA_nppicom_LIBRARY` variable. Issue: #20845
* | | | Merge topic 'file-COPY_FILE-retry'Brad King2022-11-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d34986036f ExternalData: Improve robustness on Windows to copy a data object to a file efa9eec040 file(COPY_FILE): Add option to retry on Windows if input access fails fa518188d8 cmSystemTools: Remove unused CopySingleFile overload Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7934
| * | | | ExternalData: Improve robustness on Windows to copy a data object to a fileBrad King2022-11-171-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an external data object was recently created on disk, perhaps fetched by the current process or another process, it may be inaccessible on Windows for a short time. Tell our `file(COPY_FILE)` call to retry a few times to copy the object to the final file path. Hopefully this will resolve our long-standing spurious failures of the `Module.ExternalData` test on Windows.
* | | | Merge topic 'nvhpc_fortran_extensions'Brad King2022-11-182-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a98a82f24b Fortran: Support cuf file extension when using nvfortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7925
| * | | | Fortran: Support cuf file extension when using nvfortranRobert Maynard2022-11-162-1/+4
| | | | |
* | | | | Merge topic 'FindCUDAToolkit_handle_nvptxcompiler_static_not_existing'Brad King2022-11-181-1/+3
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | | | | | | | | c7ece269da FindCUDAToolkit: Handle toolkits that don't provide nvptxcompiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7932
| * | | FindCUDAToolkit: Handle toolkits that don't provide nvptxcompilerRobert Maynard2022-11-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Some versions of the CUDA toolkit don't provide any static libraries, and therefore we need to handle that `nvptxcompiler_static` might not be found
* | | | Merge topic 'automoc-var-init'Brad King2022-11-171-3/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70c721befb AutoMoc: Don't initialize already defined CMAKE_AUTOMOC_ variables Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7922
| * | | | AutoMoc: Don't initialize already defined CMAKE_AUTOMOC_ variablesJoerg Bornemann2022-11-161-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the variables CMAKE_AUTOGEN_ORIGIN_DEPENDS, CMAKE_AUTOMOC_COMPILER_PREDEFINES, and CMAKE_AUTOMOC_MACRO_NAMES on the cmake command line did not work as expected. CMakeGenericSystem.cmake initialized these variables even if they were defined by the user. This led to the confusing situation where the cache variant of a variable had one value (defined on the command line) and the non-cache variant of a variable had a different value (defined in CMakeGenericSystem.cmake). Fix this by checking whether the variables are defined before setting their default values. Fixes: #24069
* | | | | Merge topic 'compiler-predefines-only-cxx'Brad King2022-11-179-43/+59
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d538cb0e18 Only initialize CMAKE_CXX_COMPILER_PREDEFINES_COMMAND Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7923
| * | | | | Only initialize CMAKE_CXX_COMPILER_PREDEFINES_COMMANDJoerg Bornemann2022-11-169-43/+59
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't initialize the other CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND variables. The only language variant that is used is CMAKE_CXX_COMPILER_PREDEFINES_COMMAND, and the other language variants contained invalid, namely C++-specific commands. Fixes: #23968
* | | | | Merge topic 'FindPython-enhance-SOABI'Brad King2022-11-163-19/+40
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 328d847f70 FindPython: enhance SOABI computation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7917
| * | | | FindPython: enhance SOABI computationMarc Chevrier2022-11-153-19/+40
| |/ / / | | | | | | | | | | | | Fixes: #24121, #23651
* | | | Merge topic 'qtifw-4.5'Brad King2022-11-161-0/+2
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | 351239b776 CPack/IFW: Add support for QtIFW 4.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7920
| * | 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
* | \ \ Merge topic 'legacy'Brad King2022-11-151-14/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a44d415ed3 CMakeDetermineSystem: use execute_process() vs. exec_program() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7884
| * | | | CMakeDetermineSystem: use execute_process() vs. exec_program()Michael Hirsch2022-11-131-14/+38
| | | | |
* | | | | Merge topic 'nvcc-isystem'Brad King2022-11-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 207fd956d8 CUDA: Use consistent -isystem flag style for NVIDIA nvcc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7904
generated by cgit v0.12 at 2025-01-31 09:09:13 (GMT)