summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-11-24 14:26:45 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-11-24 14:26:45 (GMT)
commit056115106a91df5396ef691a58ea4e5563fec24f (patch)
tree4a9bccc7ae46c5d64c874e9b56598e6939ebdc3a /Modules
parentf66f6e2490a883ecb9a9505d87f76869980e776f (diff)
parentae1003cdb9b6c4949022ef3b24d368c467a1d15f (diff)
downloadCMake-056115106a91df5396ef691a58ea4e5563fec24f.zip
CMake-056115106a91df5396ef691a58ea4e5563fec24f.tar.gz
CMake-056115106a91df5396ef691a58ea4e5563fec24f.tar.bz2
Merge topic 'FindCUDA-aarch64'
ae1003cd FindCUDA: Add paths for crosscompiling to aarch64
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindCUDA.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 6a21078..ada5b8a 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -653,6 +653,9 @@ set(CUDA_VERSION_STRING "${CUDA_VERSION}")
# Support for arm cross compilation with CUDA 5.5
if(CUDA_VERSION VERSION_GREATER "5.0" AND CMAKE_CROSSCOMPILING AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm" AND EXISTS "${CUDA_TOOLKIT_ROOT_DIR}/targets/armv7-linux-gnueabihf")
set(CUDA_TOOLKIT_TARGET_DIR "${CUDA_TOOLKIT_ROOT_DIR}/targets/armv7-linux-gnueabihf" CACHE PATH "Toolkit target location.")
+# Support for aarch64 cross compilation with CUDA 7.0
+elseif(CUDA_VERSION VERSION_GREATER "6.5" AND CMAKE_CROSSCOMPILING AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" AND EXISTS "${CUDA_TOOLKIT_ROOT_DIR}/targets/aarch64-linux")
+ set(CUDA_TOOLKIT_TARGET_DIR "${CUDA_TOOLKIT_ROOT_DIR}/targets/aarch64-linux" CACHE PATH "Toolkit target location.")
else()
set(CUDA_TOOLKIT_TARGET_DIR "${CUDA_TOOLKIT_ROOT_DIR}" CACHE PATH "Toolkit target location.")
endif()