Commit Graph

14750 Commits

Author SHA1 Message Date
Brad King 8295a4ad32 Merge topic 'cuda-cross-targets'
781a67bf5e CUDA/Clang: Determine cross-compiling target from CMAKE_CUDA_COMPILER_TARGET
40eeca77c3 CUDA/Clang: Sync target directory table with FindCUDAToolkit
05efcdd464 FindCUDA: Sync target directory table with FindCUDAToolkit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10421
2025-03-05 08:27:23 -05:00
Brad King 2a63964b73 Merge topic 'typos-1.30.0'
d168cd397f pre-commit: version bump `typos` hook to 1.30 + add some more ignore IDs
4d99e2b702 Help(FindJasper): Fix the spelling typo in the variable documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10417
2025-03-05 08:26:14 -05:00
Brad King 781a67bf5e CUDA/Clang: Determine cross-compiling target from CMAKE_CUDA_COMPILER_TARGET
When cross-compiling CUDA with Clang, `CMAKE_CUDA_COMPILER_TARGET` is
typically set to the target triple.  Use it to select the CUDA toolkit
target directory.
2025-03-04 13:51:29 -05:00
Brad King 40eeca77c3 CUDA/Clang: Sync target directory table with FindCUDAToolkit
Since commit 6636693134 (FindCUDAToolkit: Re-unify with
Internal/CUDAToolkit, 2020-06-11, v3.18.0-rc2~6^2~7) the table is
duplicated.

Update the CUDA target directory table for Clang to account for changes
to the equivalent table in FindCUDAToolkit:

* commit bcdd486bf7 (CUDA: Enable support on QNX, 2020-10-30,
                     v3.19.0-rc3~8^2~1)
* commit 743d4181b4 (FindCUDAToolkit: Support cross-compilation to
                     sbsa-linux, 2023-01-11, v3.26.0-rc1~118^2)
2025-03-04 13:51:29 -05:00
Brad King 05efcdd464 FindCUDA: Sync target directory table with FindCUDAToolkit
The table has been duplicated since commit 69fcad9332 (CUDAToolkit: Add
support for cross-compiling, 2020-01-21, v3.17.0-rc1~104^2~1).
2025-03-04 13:51:29 -05:00
Brad King 213ea8a752 Merge topic 'patch-ProcessorCount'
9e40bd860f ProcessorCount: Update documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10407
2025-03-04 08:48:22 -05:00
Brad King 0af6821799 Merge topic 'cpack-rpm-weak-deps-tags'
14baa13ab8 CPack/RPM: Add support for all weak dependency tags
847f515934 Tests: Simplify RunCMake.CPack_RPM.SUGGESTS expected output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10415
2025-03-04 08:47:25 -05:00
Alex Turbov 4d99e2b702 Help(FindJasper): Fix the spelling typo in the variable documentation 2025-03-04 04:25:36 +04:00
Kitware Robot 1772622772 LICENSE: Replace references to Copyright.txt with LICENSE.rst
```
git grep -lz 'Copyright.txt or https://cmake.org/licensing ' |
  while IFS= read -r -d $'\0' f ; do
    sed -i '/Copyright.txt or https:\/\/cmake.org\/licensing / {
              s/Copyright.txt/LICENSE.rst/
            }' "$f" ; done
```
2025-03-03 10:43:35 -05:00
Balazs Kosaras 14baa13ab8 CPack/RPM: Add support for all weak dependency tags
Co-authored-by: Brad King <brad.king@kitware.com>
2025-03-03 09:09:15 -05:00
Brad King 759ba45bdb Merge topic 'cpack-rpm-weak-deps'
283a48403f CPack/RPM: Fix detection of RPM support for weak dependencies
ab4e74ad0b CPack/RPM: Remove redundant conditions for presence of rpmbuild

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10403
2025-03-03 08:56:55 -05:00
Marc Chevrier 5120987bc3 Merge topic 'FindPython-tests-refactoring'
aed9dffdc9 FindPython: migrate tests to RunCMake framework

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10380
2025-03-02 08:00:08 -05:00
Peter Kokot 9e40bd860f ProcessorCount: Update documentation
Changes:
- Module documentation is sorted into a function description and a note
  section is added where cmake_host_system_information() is mentioned as
  an alternative.
- Module usage example is moved to a titled section at the end for
  better readability.
- Instead of mentioning the physical processors count, the logical
  processors is used as this is what is most likely wanted in most cases
  and also all the used commands in this module return this number.
- Function's code style is synced a bit across the code base.
2025-03-01 19:56:16 +01:00
Brad King db892c72b9 Merge topic 'patch-UseEcos-ECOSCONFIG_EXECUTABLE'
debd5ca4ff UseEcos: Mark ECOSCONFIG_EXECUTABLE as advanced

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10404
2025-03-01 10:30:57 -05:00
Brad King be3df58ff5 Merge topic 'patch-processor-count-cmd-sysinfo'
3563e37d1b ProcessorCount: Mark ProcessorCount_cmd_sysinfo as advanced

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10400
2025-03-01 10:17:08 -05:00
Brad King 283a48403f CPack/RPM: Fix detection of RPM support for weak dependencies
Add a missing `find_program` call to populate `RPM_EXECUTABLE`.
This was left out of two previous changes that intended to query
the `rpm` executable:

* In commit 9b53eca317 (CPack/RPM: Fix weak dep support, 2021-06-29,
  v3.21.0-rc2~4^2), without `RPM_EXECUTABLE` the query always failed,
  so we were concluding that weak dependencies are not supported even
  when they are.

* In commit 488de6294a (CPack: correctly perform querytags on old
  versions of RPM, 2025-01-09, v4.0.0-rc1~182^2~3), without
  `RPM_EXECUTABLE` the query always failed.  This change has not
  yet been in a release anyway.

Also fix the test case for the "suggests" field to verify this.

Issue: #22350
Reported-by: Balazs Kosaras <balazskosaras@gmail.com>
2025-02-28 17:24:44 -05:00
Brad King ab4e74ad0b CPack/RPM: Remove redundant conditions for presence of rpmbuild
If `rpmbuild` is missing, error out early.

While at it, drop unfinished `alien` support.
2025-02-28 17:06:47 -05:00
Peter Kokot debd5ca4ff UseEcos: Mark ECOSCONFIG_EXECUTABLE as advanced 2025-02-28 20:47:53 +01:00
Marc Chevrier aed9dffdc9 FindPython: migrate tests to RunCMake framework 2025-02-28 17:55:24 +01:00
Peter Kokot 3563e37d1b ProcessorCount: Mark ProcessorCount_cmd_sysinfo as advanced 2025-02-27 22:30:41 +01:00
Peter Kokot 296c74cc5c UseEcos: Update documentation
- Module macros described as a list with the usual RST syntax.
- Mention of internal macro ecos_add_target_lib() removed, as it is
  internal implementation meant for the ecos_add_executable().
- Documentation from internal comments moved to the main docs header.
- Variable descriptions updated.
- Internal comments adjusted for readability.
2025-02-27 18:53:00 +01:00
Brad King 11821a386d Merge topic 'nvpl'
9ead7c2129 FindBLAS: Add support for NVPL
dbbfec8712 Tests/Find{BLAS,LAPACK}: Comment purpose of integer size fallback
6ce494ed6d ci: Add NVPL to Debian aarch64 base image

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10374
2025-02-27 09:36:03 -05:00
Vito Gamberini 9ead7c2129 FindBLAS: Add support for NVPL 2025-02-26 13:29:03 -05:00
Brad King 6da08ab967 Merge topic 'patch-1'
b69d64f72b FindwxWidgets: special case -latomic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10377
2025-02-21 09:16:51 -05:00
Brad King 638b42532c Merge topic 'nsis-uninst-name'
33e85acff7 CPack/NSIS: Use the installed display name in uninstall prompt

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10368
2025-02-21 09:14:51 -05:00
Osyotr b69d64f72b FindwxWidgets: special case -latomic
Fixes: #26718
2025-02-20 17:23:25 -05:00
Nikita Nemkin 33e85acff7 CPack/NSIS: Use the installed display name in uninstall prompt
When a new installation prompts to uninstall the old version,
use the display name of the old version from the registry.

This only affects packages that change their CPACK_NSIS_DISPLAY_NAME.

Patch-by: David Golub <golubdr@gmail.com>
Fixes: #14112
2025-02-20 13:12:11 +05:00
redradist 520eb40e69 FindOpenCL: Fix version detection in presence of multiple versions
Previously our call to `check_symbol_exists` was passing an absolute
path to the `cl.h` header to be included.  However, this might not
include its other headers correctly.  We already set
`CMAKE_REQUIRED_INCLUDES` such that `CL/cl.h` can be included by
the check, so we do not need to include by absolute path.
2025-02-19 08:58:34 -05:00
Brad King 2123244746 FindGCCXML: Add policy to remove this module
GCC-XML has been superseded by CastXML for a long time.

Closes: #26687
2025-02-17 11:35:25 -05:00
Brad King e59f1713a8 Merge topic 'gettext-target-fix'
fee52c6fa1 FindGettext: Fix target name for the GETTEXT_PROCESS_POT_FILE function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10353
2025-02-17 10:36:32 -05:00
Brad King 64826b4b4c Merge topic 'mpi-multiline'
a7cc231bd3 FindMPI: Improve configuration extraction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10355
2025-02-17 10:34:53 -05:00
Brad King 441a757c97 Merge topic 'FindCUDAToolkit-threads'
c5d81a2468 FindCUDAToolkit: Fix precondition for dependency on Threads

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10354
2025-02-17 10:34:02 -05:00
Connor Baker c5d81a2468 FindCUDAToolkit: Fix precondition for dependency on Threads
`FindThreads` requires that C or CXX be enabled.  Previously we were
only checking that `CMAKE_{C,CXX}_COMPILER` have been set, which does
not mean the languages have been enabled.
2025-02-16 11:21:18 -05:00
Nikita Nemkin a7cc231bd3 FindMPI: Improve configuration extraction
To avoid issues with multi-line scripts, regexes that match
unquoted shell command arguments shouldn't include newlines.

Fixes: #12553
Co-authored-by: K. R. Walker
2025-02-16 13:23:02 +05:00
Brad King 95f0039f43 Merge topic 'cray_cce_omp_offload_linker'
3b18fa9e8b Cray: Fix OpenMP linking issue
e8e48ebabd Cray: Enable Cray linker wrapper detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10346
2025-02-15 07:45:06 -05:00
Yegor Yefremov fee52c6fa1 FindGettext: Fix target name for the GETTEXT_PROCESS_POT_FILE function
The correct target name is "potfiles" and not "potfile".
2025-02-15 11:45:25 +01:00
John Rodgers 3b18fa9e8b Cray: Fix OpenMP linking issue
Add the `CrayClang` compiler ID to the list of OpenMP flag candidates and
ensure the flags are propagated to the link step to trigger the Cray OpenMP
offload linker (`cce_omp_offload_linker`) wrapper.

Fixes: #24402, #24962
2025-02-14 12:54:49 -06:00
John Rodgers e8e48ebabd Cray: Enable Cray linker wrapper detection
Enable detection of the Cray OpenMP offload linker (`cce_omp_offload_linker`)
at the parse implicit link info CMake stage.

Issues: #24402, #24962
2025-02-14 12:54:25 -06:00
Brad King 808ada63cb Merge topic 'diab-compiler-support'
8ce6689d8b Diab: Add WindRiver Systems's Diab C/C++ toolchain

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10276
2025-02-14 09:35:26 -05:00
Brad King 8bc033f8c9 Merge topic 'FindGettext-whitespace'
f34c28fd57 FindGettext: CMake linting: fix mismatching spaces
c9b7906968 FindGettext: Remove the unneeded space before a full stop

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10341
2025-02-14 09:25:03 -05:00
Brad King 372a2c3630 Merge topic 'FindPython-ARTIFACTS_PREFIX'
e9770a315d FindPython: Support for multiple searches in same directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10340
2025-02-14 09:23:42 -05:00
Sanjiv Gupta 8ce6689d8b Diab: Add WindRiver Systems's Diab C/C++ toolchain
Teach CMake to recognize Diab versions 5.9.x.x and above.

Closes: #26666
2025-02-13 10:15:00 -05:00
Yegor Yefremov f34c28fd57 FindGettext: CMake linting: fix mismatching spaces 2025-02-13 16:10:05 +01:00
Yegor Yefremov c9b7906968 FindGettext: Remove the unneeded space before a full stop 2025-02-13 16:09:55 +01:00
Marc Chevrier e9770a315d FindPython: Support for multiple searches in same directory
This is a complement to commit 9b0510fa57 (FindPython: add support for
multiple searches in same directory, 2025-01-05).
2025-02-13 09:36:43 -05:00
Yegor Yefremov d1b888a55e FindGettext: Fix gettext_create_translations signature and description
The first input parameter is a potfile and not mofile.
Also mention the fact that the generated binary files
will be automatically installed.
2025-02-12 10:12:40 -05:00
Brad King d1e0eb405f Merge topic 'linker-configuration-haiku'
379785e869 Linker configuration: Add missing platform Haiku

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10318
2025-02-10 16:16:22 -05:00
Brad King 576abb42cf Merge topic 'linker-configuration-haiku' into release-4.0
379785e869 Linker configuration: Add missing platform Haiku

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10318
2025-02-10 16:16:20 -05:00
Begasus 379785e869 Linker configuration: Add missing platform Haiku
Add Haiku information modules missed by commit c1c4cf9545 (Linker
configuration: introduce a new architecture, 2024-06-05,
v3.31.0-rc1~307^2~1).
2025-02-10 10:27:27 -05:00
Brad King 15a2b506c8 Merge topic 'post-rel-dev'
f8db82ba81 Configure CMake itself with policies through CMake 3.31
34652be5d2 export: Increase maximum policy version in exported files to 3.31
5cd2669146 Add deprecation warnings for policies CMP0142 and below

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10296
2025-02-09 12:36:54 -05:00