[Cmake-commits] CMake branch, next, updated. v2.8.1-1413-g7365957

[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  7365957ee3e808d5c7f8224f993e6372ba8b7828 (commit)
       via  1d5554201f725d3158e05c1a91ff09fab1633b26 (commit)
      from  e8c40d338ee362ca71b1e1e52f20e7a9ffabe5a6 (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=7365957ee3e808d5c7f8224f993e6372ba8b7828
commit 7365957ee3e808d5c7f8224f993e6372ba8b7828
Merge: e8c40d3 1d55542
Author: James Bigler <jamesbigler at gmail.com>
Date:   Tue Jun 15 10:11:00 2010 -0600

    Merge branch 'topics/FixCudaVersionAfterFirstRun' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1d5554201f725d3158e05c1a91ff09fab1633b26
commit 1d5554201f725d3158e05c1a91ff09fab1633b26
Author: James Bigler <jamesbigler at gmail.com>
Date:   Tue Jun 15 10:03:40 2010 -0600

    CUDA_VERSION variable passed to REGEX needs quotes to work when not defined.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 2c2e9fd..17da9e9 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -486,8 +486,8 @@ if(CUDA_NVCC_EXECUTABLE AND NOT CUDA_VERSION)
   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})
+  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, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake