[Cmake-commits] CMake branch, next, updated. v2.8.2-997-g97c18a0

[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  97c18a0af4bf1b14da39ac8d07f16e69db6d48eb (commit)
       via  6916f8dba73069bce71c6032b9a90dd6579c0971 (commit)
      from  c9bcf5a065facaac96b8ee3ef1361be15848722f (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=97c18a0af4bf1b14da39ac8d07f16e69db6d48eb
commit 97c18a0af4bf1b14da39ac8d07f16e69db6d48eb
Merge: c9bcf5a 6916f8d
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Mon Oct 4 16:43:49 2010 -0600
Commit:     James Bigler <jamesbigler at gmail.com>
CommitDate: Mon Oct 4 16:43:49 2010 -0600

    Merge branch 'topics/FindCUDA-allow-g3' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6916f8dba73069bce71c6032b9a90dd6579c0971
commit 6916f8dba73069bce71c6032b9a90dd6579c0971
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Mon Oct 4 16:42:21 2010 -0600
Commit:     James Bigler <jamesbigler at gmail.com>
CommitDate: Mon Oct 4 16:42:21 2010 -0600

    Allow -g3 for CUDA v3.0+.
    
    In versions of the CUDA toolkit previous to version 3.0 the use of -g3 would cause
    compilation errors.  This was fixed in version 3.0.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index dad5709..5b189d4 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -941,8 +941,8 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
     # we convert the strings to lists (like we want).
 
     if(CUDA_PROPAGATE_HOST_FLAGS)
-      # nvcc chokes on -g3, so replace it with -g
-      if(CMAKE_COMPILER_IS_GNUCC)
+      # nvcc chokes on -g3 in versions previous to 3.0, so replace it with -g
+      if(CMAKE_COMPILER_IS_GNUCC AND CUDA_VERSION VERSION_LESS "3.0")
         string(REPLACE "-g3" "-g" _cuda_C_FLAGS "${CMAKE_${CUDA_C_OR_CXX}_FLAGS_${config_upper}}")
       else()
         set(_cuda_C_FLAGS "${CMAKE_${CUDA_C_OR_CXX}_FLAGS_${config_upper}}")

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

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


hooks/post-receive
-- 
CMake