dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-04 23:00:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'findcudatoolkit_cross_scattered'

Browse Source 
9d3f7872e1 FindCUDAToolkit: Support scattered installations when crosscompiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5247
This commit is contained in:
Brad King
2020-09-22 11:40:28 +00:00
committed by Kitware Robot
parent 13a326536b 9d3f7872e1
commit cedc0a0329
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Help/release/dev/cuda-clang-scattered-cross.rst
View File

@@ -1,5 +0,0 @@
cuda-clang-scattered-cross
--------------------------
* Scattered toolkit installations are now recognized when crosscompiling
``CUDA`` using Clang.

7
Help/release/dev/cuda-scattered-cross.rst Normal file
View File

@@ -0,0 +1,7 @@
cuda-scattered-cross
--------------------
* Scattered toolkit installations are now recognized when crosscompiling
``CUDA`` using Clang.
* :module:`FindCUDAToolkit` now finds scattered toolkit installations when
crosscompiling.

9
Modules/FindCUDAToolkit.cmake
View File

@@ -668,16 +668,14 @@ else()
unset(_CUDAToolkit_version_file)
endif()
# Handle cross compilation
# Find target directory when crosscompiling.
if(CMAKE_CROSSCOMPILING)
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7-a")
# Support for NVPACK
set(CUDAToolkit_TARGET_NAME "armv7-linux-androideabi")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
# Support for arm cross compilation
set(CUDAToolkit_TARGET_NAME "armv7-linux-gnueabihf")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
# Support for aarch64 cross compilation
if(ANDROID_ARCH_NAME STREQUAL "arm64")
set(CUDAToolkit_TARGET_NAME "aarch64-linux-androideabi")
else()
@@ -698,7 +696,10 @@ if(CMAKE_CROSSCOMPILING)
# PATh
set(_CUDAToolkit_Pop_ROOT_PATH True)
endif()
else()
endif()
# If not already set we can simply use the toolkit root or it's a scattered installation.
if(NOT CUDAToolkit_TARGET_DIR)
# Not cross compiling
set(CUDAToolkit_TARGET_DIR "${CUDAToolkit_ROOT_DIR}")
# Now that we have the real ROOT_DIR, find components inside it.