[Cmake-commits] CMake branch, next, updated. v3.1.0-1498-g56054b1

[Rolf Eike Beer]

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  56054b1982748475a350239ae42d99af0554242a (commit)
       via  52d4ff49d973d77dba480e0b60b08c6c70e94538 (commit)
      from  9b8ba31802a3e89b8aa1f34b3dfa7521d47c235a (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56054b1982748475a350239ae42d99af0554242a
commit 56054b1982748475a350239ae42d99af0554242a
Merge: 9b8ba31 52d4ff4
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 5 05:57:28 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 5 05:57:28 2015 -0500

    Merge topic 'FindCUDA-cross' into next
    
    52d4ff49 Fix FindCUDA.cmake assumption about cross-compiling


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52d4ff49d973d77dba480e0b60b08c6c70e94538
commit 52d4ff49d973d77dba480e0b60b08c6c70e94538
Author:     Mark Abraham <mark.j.abraham at gmail.com>
AuthorDate: Sun Jan 4 14:37:51 2015 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jan 5 11:56:50 2015 +0100

    Fix FindCUDA.cmake assumption about cross-compiling
    
    CMAKE_SYSTEM_PROCESSOR is not guaranteed to be defined (per
    http://www.vtk.org/Wiki/CMake_Cross_Compiling), and when cross
    compiling where it happens to be undefined, this module was broken.

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

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

Summary of changes:
 Modules/FindCUDA.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake