mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-05 06:08:41 -06:00
Code Issues Packages Projects Releases Wiki Activity
63,312 Commits 2 Branches 392 Tags
e0765c2c4620ccd4b86dfd05ba051ca577ab88c3
Commit Graph

13541 Commits

Author SHA1 Message Date
Brad King
5d32320bf3 Merge topic 'hip-nvidia' 
fd982eec10 HIP: Add tests for special NVIDIA values of CMAKE_HIP_ARCHITECTURES
8c8b3f1bfa HIP: Fix support for -DCMAKE_HIP_ARCHITECTURES=native with NVCC
b3e92775ab HIP: Add CMAKE_HIP_HOST_COMPILER when compiler is NVCC
e43918b4ca HIP: Fix linking mixed-lang binary with CXX compiler and Makefile generators
4794505122 HIP: Do not require hip-lang package for NVIDIA platform
09d759dc7f HIP: Simplify exclusion of AMD device runtime with NVIDIA GPUs
2a60663670 HIP: Simplify CMAKE_GENERATOR references for determining compiler
8124950f6c CUDA: Generalize CMAKE_{CUDA => <LANG>}_HOST_COMPILER variable docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8836
 2023-09-26 09:40:25 -04:00
Brad King
8a39d146d4 Merge topic 'FindOpenMP-macOS-LLVM-Clang' 
3cff031c9a FindOpenMP: Handle non-Apple clang on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8832
 2023-09-26 09:33:02 -04:00
Brad King
0be496cb5a Merge topic 'orangec-compiler' 
f8fa4f1ad7 ci: Add OrangeC 6.73.1 nightly CI job
531b4fe643 OrangeC: Add support for OrangeC compiler
10f435a58f Tests: Simplify nested if conditions in Complex tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Victor <lostfreeman@gmail.com>
Merge-request: !8592
 2023-09-26 09:23:10 -04:00
Brad King
187fb1911f Merge topic 'add-c++23' 
961a077238 IBMClang: Add provisional flags for C++23

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8837
 2023-09-26 09:18:10 -04:00
Craig Scott
8a90ae92af Merge topic 'FetchContent-EXCLUDE_FROM_ALL' 
5f77807f1c FetchContent: Add support for EXCLUDE_FROM_ALL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8822
 2023-09-26 08:35:45 -04:00
Xing Xue
961a077238 IBMClang: Add provisional flags for C++23 
With this one can use the IBM Open XL C/C++ compiler to build projects
that require feature `cxx_std_23`.
 2023-09-25 19:05:31 -04:00
Steven Stallion
5f77807f1c FetchContent: Add support for EXCLUDE_FROM_ALL 
Fixes: #20167
 2023-09-26 08:56:44 +10:00
Brad King
8c8b3f1bfa HIP: Fix support for -DCMAKE_HIP_ARCHITECTURES=native with NVCC 2023-09-25 16:21:55 -04:00
Brad King
b3e92775ab HIP: Add CMAKE_HIP_HOST_COMPILER when compiler is NVCC 
Also add `HIPHOSTCXX` environment variable.
 2023-09-25 16:11:18 -04:00
Brad King
4794505122 HIP: Do not require hip-lang package for NVIDIA platform 
ROCm may not install the `hip-lang` cmake package on NVIDIA platforms.
Skip verifying its presence.  We do not use it for NVIDIA platforms anyway.

Fixes: #25271
 2023-09-25 16:06:36 -04:00
Brad King
09d759dc7f HIP: Simplify exclusion of AMD device runtime with NVIDIA GPUs 2023-09-25 16:06:36 -04:00
Brad King
2a60663670 HIP: Simplify CMAKE_GENERATOR references for determining compiler 2023-09-25 16:06:36 -04:00
Brad King
8124950f6c CUDA: Generalize CMAKE_{CUDA => <LANG>}_HOST_COMPILER variable docs 2023-09-25 16:06:30 -04:00
David Lindauer
531b4fe643 OrangeC: Add support for OrangeC compiler 
Add compiler information modules.  Update the test suite.

Fixes: #25032
Co-authored-by: Brad King <brad.king@kitware.com>
 2023-09-25 12:27:29 -04:00
Brad King
62d93c9f43 Merge topic 'FindDoxygen-broken-binary' 
a960b901de FindDoxygen: Remove redundant debug message when Doxygen fails
59a4aaa237 FindDoxygen: Disable Doxygen if executable returns non-zero result

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8815
 2023-09-25 08:59:43 -04:00
Brad King
89d155e1bb Merge topic 'CrayClang-compiler' 
80838316a8 CrayClang: Add support for this compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8781
 2023-09-25 08:58:25 -04:00
Brad King
82a2f198d8 Merge topic 'cxxmodules-gcc-14' 
4089954595 gitlab-ci: update to GCC CI container with merged P1689R5
c2564f5916 ci: drop extra scandep source settings for GCC
ee52a02d56 ci: update GCC build to use master after P1689R5 is merged
4f0410959e GCC: add rules for scanning C++ module dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8827
 2023-09-25 08:56:04 -04:00
Keno Fischer
3cff031c9a FindOpenMP: Handle non-Apple clang on macOS 
I was noticing that FindOpenMP was failing to find my openmp installation
on macos when building with a custom-compiled clang. Upon inspection it
appears that FindOpenMP is looking for `AppleClang` as a compiler
identification and the `Clang` case is only applicable for Win32.
Try to fix that by treating custom `Clang` on macos the same as
`AppleClang`.
 2023-09-24 19:28:58 +02:00
Christoph Grüninger
a960b901de FindDoxygen: Remove redundant debug message when Doxygen fails 
We warn for this now.
 2023-09-22 10:11:30 -04:00
Christoph Grüninger
59a4aaa237 FindDoxygen: Disable Doxygen if executable returns non-zero result 
This makes detection of Doxygen more robust in case of broken Doxygen
executables. Doxygen is called to determine its version number. If this
call returns a non-zero result, we have an indication that the Doxygen
executable is broken. We report Doxygen as not found to prevent issues
with checks for other Doxygen component, that might lead to
configuration aborts.

Fixes: #18708
 2023-09-22 10:11:22 -04:00
Ryan Krattiger
80838316a8 CrayClang: Add support for this compiler 
Add `CrayClang` compiler ID for newer Cray compilers.

Fixes: #25102
 2023-09-22 09:39:52 -04:00
Brad King
122ec98dcf Merge topic 'hip-nvidia' 
6546aa2a2a ci: Add HIP job using CUDA on NVIDIA GPUs
18158bf81c HIP: Add support for NVIDIA GPUs
127b6fa06b HIP: Add CMAKE_HIP_PLATFORM variable to specify GPU platform
90e23f40ee Tests/HIP/WithDefs: Clean up test case
9ebdf3281f Tests/HIP/ArchitectureOff: Cover HIP_ARCHITECTURES initialization
cfec29196e ci: Add CUDA 11.8 to HIP 5.5 image
26470eb987 ci: Put HIP GPU platform in CMake_TEST_HIP

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8817
 2023-09-22 09:19:52 -04:00
Brad King
d2655c59dc Merge topic 'cuda-factor-out-lang' 
b32ea7cff0 CUDA: Factor out helper to generate CUDA architecture flags
b3a1f17567 CUDA: Factor out helper to validate CMAKE_CUDA_ARCHITECTURES
8617c28221 CUDA: Factor out helper for detecting native CUDA architectures
0db0fe7958 CUDA: Factor out helper to compute all CUDA architectures
c16f1e2b93 CUDA: Factor out helper to find CUDA Toolkit for compiler
a6841a967b CUDA: Factor out helper to filter implicit link libraries
deff0e638d CUDA: Factor out helper to parse NVCC implicit compiler and linker flags
e1b2a5062f CUDA: Factor out some NVCC compiler information
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !8816
 2023-09-22 09:18:53 -04:00
Brad King
af888a07f8 Merge topic 'macOS-simplify-framework-link-option' 
a61c1d6ff4 macOS: Framework: simplify link flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !8824
 2023-09-22 09:06:10 -04:00
Brad King
18158bf81c HIP: Add support for NVIDIA GPUs 
Add support for using the CUDA Toolkit's NVCC to compile HIP code.

Fixes: #25143
 2023-09-21 15:34:37 -04:00
Brad King
127b6fa06b HIP: Add CMAKE_HIP_PLATFORM variable to specify GPU platform 
For now, require the value to be `amd`, since that is the only
platform we currently support.
 2023-09-21 15:34:37 -04:00
Brad King
b3a1f17567 CUDA: Factor out helper to validate CMAKE_CUDA_ARCHITECTURES 
Prepare to use it for other languages.
 2023-09-21 15:34:28 -04:00
Brad King
8617c28221 CUDA: Factor out helper for detecting native CUDA architectures 
Prepare to use it for other languages.
 2023-09-21 15:34:28 -04:00
Brad King
0db0fe7958 CUDA: Factor out helper to compute all CUDA architectures 
Prepare to use it for other languages.
 2023-09-21 15:34:28 -04:00
Brad King
c16f1e2b93 CUDA: Factor out helper to find CUDA Toolkit for compiler 
Prepare to use it for other languages.
 2023-09-21 15:34:28 -04:00
Brad King
a6841a967b CUDA: Factor out helper to filter implicit link libraries 
Prepare to use it for other languages.
 2023-09-21 15:34:27 -04:00
Brad King
deff0e638d CUDA: Factor out helper to parse NVCC implicit compiler and linker flags 
Prepare to use it for other languages.
 2023-09-21 15:34:27 -04:00
Brad King
e1b2a5062f CUDA: Factor out some NVCC compiler information 
Prepare to use nvcc for other languages.
 2023-09-21 15:34:27 -04:00
Brad King
f125dfcd30 CUDA: Clarify order of logic finding CUDA Toolkit for compiler 
Finish all the search logic before using any results.
 2023-09-21 15:34:27 -04:00
Brad King
d08b7f3cda CUDA: Clarify compiler-specific logic in architectures table 2023-09-21 15:34:27 -04:00
Brad King
7b2aec0fef CUDA: Clarify logic detecting compiler default CUDA architectures 
Improve variable names and comments.

Remove a comment missed by commit c267ed205a (CUDA: Defer architecture
testing to the compiler testing step, 2022-04-25, v3.24.0-rc1~222^2)
about architecture verification.
 2023-09-21 15:34:27 -04:00
Brad King
69a5ef7cc0 CUDA: Simplify isolation of work variables for determining compiler 
Unset variables as soon as we are done with them.
Rename one work variable to a private name.
 2023-09-21 15:34:27 -04:00
Brad King
8a966debe3 CUDA: Combine consecutive blocks using same condition for determining compiler 2023-09-21 15:34:26 -04:00
Brad King
72efbeadae CUDA: Simplify CMAKE_GENERATOR references for determining compiler 2023-09-21 15:34:23 -04:00
Ben Boeckel
4f0410959e GCC: add rules for scanning C++ module dependencies 2023-09-21 09:44:48 -04:00
Marc Chevrier
a61c1d6ff4 macOS: Framework: simplify link flag 
Use the compiler option rather than the linker one.
 2023-09-21 13:55:05 +02:00
scivision
d95988c8c3 FindJNI: use modern foreach() syntax 2023-09-20 14:22:37 -04:00
scivision
7e4fe71633 FindJNI: use 2-space indents 2023-09-20 14:22:37 -04:00
scivision
88411fd629 FindJNI: use cmake_host_system_info to query registry 2023-09-20 14:22:37 -04:00
scivision
b56d4e041a FindJava: use cmake_host_system_info to query registry 2023-09-20 14:22:37 -04:00
scivision
bab9a23724 FindJava: use modern foreach() syntax 2023-09-20 14:22:30 -04:00
Brad King
59f6892ab7 Merge topic 'FindPkgConfig-override' 
e0d00b9218 FindPkgConfig: Allow to override variables when calling pkg_get_variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8808
 2023-09-20 09:25:56 -04:00
Brad King
3d3c49cd9c Merge topic 'update-module-document' 
3a54ee8cd5 FindQuickTime: Improve documentation formatting
3cf5f4af54 FindProducer: Improve documentation formatting
b35c17b202 FindPhysFS: Improve documentation formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8812
 2023-09-19 09:09:44 -04:00
Corentin Noël
e0d00b9218 FindPkgConfig: Allow to override variables when calling pkg_get_variable 
This is specifically useful when building applications within containers as we
sometimes need to redefine the prefix used in a variable.
 2023-09-19 09:08:48 +02:00
scivision
39881de3f6 FindMatlab:macOS: return full version when found by path guess 2023-09-18 15:50:48 -04:00