[Cmake-commits] CMake branch, next, updated. v2.8.1-1401-ga83b871

[James Bigler]

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  a83b8715bb52c48b670868fee5f1924fd383b082 (commit)
       via  0d30e3fe91717f519722a71470a5180c13818a2a (commit)
      from  229a4d454a05e377f014c9ca4a21da26d91a2ac0 (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=a83b8715bb52c48b670868fee5f1924fd383b082
commit a83b8715bb52c48b670868fee5f1924fd383b082
Merge: 229a4d4 0d30e3f
Author: James Bigler <jamesbigler at gmail.com>
Date:   Mon Jun 14 23:49:24 2010 -0600

    Merge branch 'topics/FixCudaVersionAfterFirstRun' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d30e3fe91717f519722a71470a5180c13818a2a
commit 0d30e3fe91717f519722a71470a5180c13818a2a
Author: James Bigler <jamesbigler at gmail.com>
Date:   Wed May 12 16:38:51 2010 -0600

    Fixed: CUDA_VERSION_MAJOR/MINOR now computed after first run.
    
    CUDA_VERSION_MAJOR and CUDA_VERSION_MINOR were only computed when CUDA_VERSION was first
    computed.  Subsequent runs of FindCUDA would not have CUDA_VERSION_MAJOR/MINOR set.  We
    now extract the major and minor versions from the CUDA_VERSION cache variable every run.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 6539057..2c2e9fd 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -484,6 +484,10 @@ if(CUDA_NVCC_EXECUTABLE AND NOT CUDA_VERSION)
   string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\2" CUDA_VERSION_MINOR ${NVCC_OUT})
   set(CUDA_VERSION "${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}" CACHE STRING "Version of CUDA as computed from nvcc.")
   mark_as_advanced(CUDA_VERSION)
+else()
+  # Need to set these based off of the cached value
+  string(REGEX REPLACE "([0-9]+)\\.([0-9]+).*" "\\1" CUDA_VERSION_MAJOR ${CUDA_VERSION})
+  string(REGEX REPLACE "([0-9]+)\\.([0-9]+).*" "\\2" CUDA_VERSION_MINOR ${CUDA_VERSION})
 endif()
 
 # Always set this convenience variable

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

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


hooks/post-receive
-- 
CMake