diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-08 19:43:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-08 19:43:53 (GMT) |
| commit | f00e44a9f71395c5960bd83a86a1a537a7bf7e79 (patch) | |
| tree | 9f2c0010b6e4743f4b21ba882793ef7089fd8312 /Modules | |
| parent | 13a2154c380d03e5256aa4d7013dd8465bca0a9c (diff) | |
| parent | d5846eb153e277980f59f70c92807851a429c3c1 (diff) | |
| download | CMake-f00e44a9f71395c5960bd83a86a1a537a7bf7e79.zip CMake-f00e44a9f71395c5960bd83a86a1a537a7bf7e79.tar.gz CMake-f00e44a9f71395c5960bd83a86a1a537a7bf7e79.tar.bz2 | |
Merge branch 'FindCUDA-cross' into release
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindCUDA.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 29bb875..ecfc781 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -613,7 +613,7 @@ endif() 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") +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.") else() set(CUDA_TOOLKIT_TARGET_DIR "${CUDA_TOOLKIT_ROOT_DIR}" CACHE PATH "Toolkit target location.") @@ -621,7 +621,7 @@ endif() mark_as_advanced(CUDA_TOOLKIT_TARGET_DIR) # Target CPU architecture -if(CUDA_VERSION VERSION_GREATER "5.0" AND CMAKE_CROSSCOMPILING AND ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") +if(CUDA_VERSION VERSION_GREATER "5.0" AND CMAKE_CROSSCOMPILING AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm") set(_cuda_target_cpu_arch_initial "ARM") else() set(_cuda_target_cpu_arch_initial "") |