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 018444bac72ac1672f9886449cd53745888e9d24 (commit) via d5846eb153e277980f59f70c92807851a429c3c1 (commit) from 8b10da3c7437e7486b0a2661c9439e58c94b0bca (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=018444bac72ac1672f9886449cd53745888e9d24 commit 018444bac72ac1672f9886449cd53745888e9d24 Merge: 8b10da3 d5846eb Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Jan 8 14:41:34 2015 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Jan 8 14:41:34 2015 -0500 Merge topic 'FindCUDA-cross' into next d5846eb1 FindCUDA: Do not assume CMAKE_SYSTEM_PROCESSOR is set http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5846eb153e277980f59f70c92807851a429c3c1 commit d5846eb153e277980f59f70c92807851a429c3c1 Author: Mark Abraham <mark.j.abra...@gmail.com> AuthorDate: Sun Jan 4 14:37:51 2015 +0100 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Jan 8 14:39:16 2015 -0500 FindCUDA: Do not assume CMAKE_SYSTEM_PROCESSOR is set CMAKE_SYSTEM_PROCESSOR is not guaranteed to be defined (per http://www.cmake.org/Wiki/CMake_Cross_Compiling), and when cross compiling where it happens to be undefined, this module was broken. Reviewed-by: Rolf Eike Beer <e...@sf-mail.de> 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: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits