[Cmake-commits] CMake branch, next, updated. v3.4.0-1488-g6dd5bb8

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6dd5bb882afe66f252a7c925a30493cb207c9fa0 (commit)
       via  ae1003cdb9b6c4949022ef3b24d368c467a1d15f (commit)
      from  b62d3d17ce22297278dd084ab11142899d91157f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6dd5bb882afe66f252a7c925a30493cb207c9fa0
commit 6dd5bb882afe66f252a7c925a30493cb207c9fa0
Merge: b62d3d1 ae1003c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 23 14:34:53 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 23 14:34:53 2015 -0500

    Merge topic 'FindCUDA-aarch64' into next
    
    ae1003cd FindCUDA: Add paths for crosscompiling to aarch64


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae1003cdb9b6c4949022ef3b24d368c467a1d15f
commit ae1003cdb9b6c4949022ef3b24d368c467a1d15f
Author:     Alexander Szakaly <alexander.szakaly at volvocars.com>
AuthorDate: Mon Nov 23 15:17:52 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 23 14:34:08 2015 -0500

    FindCUDA: Add paths for crosscompiling to aarch64
    
    Choose a CUDA_TOOLKIT_TARGET_DIR for the aarch64 architecture
    automatically.

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()

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindCUDA.cmake |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake