[Cmake-commits] CMake branch, next, updated. v3.1.0-1508-g7d6c29f

[Robert Maynard]

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  7d6c29fc162f8977700c590f868800779de2594f (commit)
       via  b4e54f9b8c748f78d16e9da055a7e0436d7654ef (commit)
      from  007b0452b5f7e536f1f88b30bcc5331227cbb098 (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=7d6c29fc162f8977700c590f868800779de2594f
commit 7d6c29fc162f8977700c590f868800779de2594f
Merge: 007b045 b4e54f9
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Wed Jan 7 11:26:49 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 7 11:26:49 2015 -0500

    Merge topic 'FindCUDA.cmake/UseCMAKE_CXX_FLAGS_separableCompilation' into next
    
    b4e54f9b FindCUDA: Add relevant CMAKE_{C,CXX}_FLAGS for separable compilation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4e54f9b8c748f78d16e9da055a7e0436d7654ef
commit b4e54f9b8c748f78d16e9da055a7e0436d7654ef
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Tue Jan 6 16:28:05 2015 -0700
Commit:     James Bigler <jamesbigler at gmail.com>
CommitDate: Tue Jan 6 16:28:05 2015 -0700

    FindCUDA: Add relevant CMAKE_{C,CXX}_FLAGS for separable compilation
    
    Previously only the CMAKE_{C,CXX}_FLAGS_<CONFIG> flags were inspected
    for relevant flags when compiling the intermediate link file.  We need
    to also consider the configuration agnostic flags, CMAKE_{C,CXX}_FLAGS
    as well.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 29bb875..b420005 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -1423,7 +1423,8 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options
     if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 AND CUDA_HOST_COMPILER )
       list(APPEND nvcc_flags -ccbin "\"${CUDA_HOST_COMPILER}\"")
     endif()
-    # Create a list of flags specified by CUDA_NVCC_FLAGS_${CONFIG}
+
+    # Create a list of flags specified by CUDA_NVCC_FLAGS_${CONFIG} and CMAKE_${CUDA_C_OR_CXX}_FLAGS*
     set(config_specific_flags)
     set(flags)
     foreach(config ${CUDA_configuration_types})
@@ -1438,6 +1439,13 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options
         list(APPEND flags $<$<CONFIG:${config}>:-Xcompiler> $<$<CONFIG:${config}>:${f}>)
       endforeach()
     endforeach()
+    # Add CMAKE_${CUDA_C_OR_CXX}_FLAGS
+    set(important_host_flags)
+    _cuda_get_important_host_flags(important_host_flags ${CMAKE_${CUDA_C_OR_CXX}_FLAGS})
+    foreach(f ${important_host_flags})
+      list(APPEND flags -Xcompiler ${f})
+    endforeach()
+
     # Add our general CUDA_NVCC_FLAGS with the configuration specifig flags
     set(nvcc_flags ${CUDA_NVCC_FLAGS} ${config_specific_flags} ${nvcc_flags})
 

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

Summary of changes:
 Modules/FindCUDA.cmake |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake