mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 07:08:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
63,262 Commits 2 Branches 401 Tags
82a2f198d8794a5a4c337f754c770d68d5e896a1
Commit Graph

63262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kitware Robot 1db7ca915f CMake Nightly Date Stamp 2023-09-25 00:01:47 -04:00
Kitware Robot 8847fceac6 CMake Nightly Date Stamp 2023-09-24 00:01:12 -04:00
Kitware Robot b26892e8a2 CMake Nightly Date Stamp 2023-09-23 00:01:12 -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 2dafd1f092 Merge topic 'macOS-system-framework-link' 
3bdf95f942 macOS: GNU toolchain: ensure framework, marked as SYSTEM, can be linked

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8825
 2023-09-22 09:07:11 -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
Kitware Robot cc49d22e62 CMake Nightly Date Stamp 2023-09-22 00:01:16 -04:00
Ben Boeckel 4089954595 gitlab-ci: update to GCC CI container with merged P1689R5 2023-09-21 22:02:24 -04:00
Brad King 6546aa2a2a ci: Add HIP job using CUDA on NVIDIA GPUs 2023-09-21 15:34:37 -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 90e23f40ee Tests/HIP/WithDefs: Clean up test case 
Fix code copied from equivalent CUDA test.

Drop `CMAKE_HIP_ARCHITECTURES=OFF`.  That is already covered by
a dedicated `HIP.ArchitectureOff` test.
 2023-09-21 15:34:37 -04:00
Brad King 9ebdf3281f Tests/HIP/ArchitectureOff: Cover HIP_ARCHITECTURES initialization 
Verify that the property is initialized by `CMAKE_HIP_ARCHITECTURES`.
 2023-09-21 15:34:37 -04:00
Brad King cfec29196e ci: Add CUDA 11.8 to HIP 5.5 image 2023-09-21 15:34:37 -04:00
Brad King 26470eb987 ci: Put HIP GPU platform in CMake_TEST_HIP 
The `CMake_TEST_HIP` option is added explicitly to builds where we want
the tests to run, so we can set it to a value indicating the HIP GPU
platform.
 2023-09-21 15:34:36 -04:00
Brad King b32ea7cff0 CUDA: Factor out helper to generate CUDA architecture flags 
Prepare to use it for other languages.
 2023-09-21 15:34:28 -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
Marc Chevrier 3bdf95f942 macOS: GNU toolchain: ensure framework, marked as SYSTEM, can be linked 
Fixes: #25263
 2023-09-21 16:29:40 +02:00
Ben Boeckel c2564f5916 ci: drop extra scandep source settings for GCC 2023-09-21 09:44:48 -04:00
Ben Boeckel ee52a02d56 ci: update GCC build to use master after P1689R5 is merged 2023-09-21 09:44:48 -04:00
Ben Boeckel 4f0410959e GCC: add rules for scanning C++ module dependencies 2023-09-21 09:44:48 -04:00
Brad King f83790af0b Merge topic 'fileset-private-dep' 
ec2ba29ac5 Ninja: Allow compilation before generation of dependencies' private sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8420
 2023-09-21 09:39:56 -04:00
Brad King 8030dd0986 Merge topic 'findjava' 
d95988c8c3 FindJNI: use modern foreach() syntax
7e4fe71633 FindJNI: use 2-space indents
88411fd629 FindJNI: use cmake_host_system_info to query registry
b56d4e041a FindJava: use cmake_host_system_info to query registry
bab9a23724 FindJava: use modern foreach() syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8818
 2023-09-21 08:07:18 -04:00
Brad King 6a9a738e99 Merge topic 'doc-find-arch-paths' 
51c2927816 Help: Clarify requirements for find_package to use lib{64,32,x32} paths
e625255fe4 Help: Indent find_package REGISTRY_VIEW paragraphs together

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Roscoe A. Bartlett <rabartl@sandia.gov>
Merge-request: !8819
 2023-09-21 08:06:16 -04:00
Brad King 8971bd4d1b Merge topic 'ci-cmake-update' 
08d77470ef ci: Update CMake version to 3.27.6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8821
 2023-09-21 08:03:55 -04:00
Brad King aa92b1d0eb Merge topic 'ci-clang17-windows' 
4c92fc709a ci: Update LLVM/Clang to 17.0 in nightly CI jobs on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8820
 2023-09-21 08:03:02 -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
Kitware Robot 4ac624debc CMake Nightly Date Stamp 2023-09-21 00:01:19 -04:00
Kyle Edwards 08d77470ef ci: Update CMake version to 3.27.6 2023-09-20 15:06:46 -04: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 51c2927816 Help: Clarify requirements for find_package to use lib{64,32,x32} paths 
Issue: #25157
 2023-09-20 12:44:00 -04:00
Brad King e625255fe4 Help: Indent find_package REGISTRY_VIEW paragraphs together 
In commit 8d7e80cf3d (find_* commands: add control over Windows registry
views, 2022-04-16, v3.24.0-rc1~201^2) this indentation was used for the
other find commands but was left out for `find_package`.
 2023-09-20 12:31:27 -04:00