[Cmake-commits] CMake branch, next, updated. v2.8.9-201-g2a69aed

[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  2a69aedbce439d301661389748b4d383c6a57b57 (commit)
       via  a20c41d0328f6a4557789bb382c9b3f69b76ea30 (commit)
      from  e8c18d5af921a39fa6e1cacf42f4f95fc7bb11a2 (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=2a69aedbce439d301661389748b4d383c6a57b57
commit 2a69aedbce439d301661389748b4d383c6a57b57
Merge: e8c18d5 a20c41d
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Mon Aug 20 18:05:19 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 20 18:05:19 2012 -0400

    Merge topic 'topics/FindCUDA/Fix-g3-again' into next
    
    a20c41d Replace -g3 with -g for CUDA 4.1 and 4.2 in addition to CUDA < 3.0.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a20c41d0328f6a4557789bb382c9b3f69b76ea30
commit a20c41d0328f6a4557789bb382c9b3f69b76ea30
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Tue Jun 19 10:04:51 2012 -0600
Commit:     James Bigler <jamesbigler at gmail.com>
CommitDate: Tue Jun 19 10:04:51 2012 -0600

    Replace -g3 with -g for CUDA 4.1 and 4.2 in addition to CUDA < 3.0.
    
    CUDA 4.1 reintroduced the bug where -g3 breaks compilation.  This
    wasn't fixed until CUDA 5.0, so both CUDA 4.1 and 4.2 have this bug.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 9f8d575..e79353e 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -1016,7 +1016,17 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
 
     if(CUDA_PROPAGATE_HOST_FLAGS)
       # 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")
+      set(_cuda_fix_g3 FALSE)
+
+      if(CMAKE_COMPILER_IS_GNUCC)
+        if (CUDA_VERSION VERSION_LESS  "3.0" OR
+            CUDA_VERSION VERSION_EQUAL "4.1" OR
+            CUDA_VERSION VERSION_EQUAL "4.2"
+            )
+          set(_cuda_fix_g3 TRUE)
+        endif()
+      endif()
+      if(_cuda_fix_g3)
         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 |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake