[Cmake-commits] CMake branch, next, updated. v3.5.0-584-gb1440cd

[Brad King]

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  b1440cd46ecb9fd5553f916c4133f376361fa76c (commit)
       via  72a97b7a761b46fd1668e3ae81dd9322972f4cb3 (commit)
      from  c74e1f51a5b04ca22886b3c7219045212fc36935 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1440cd46ecb9fd5553f916c4133f376361fa76c
commit b1440cd46ecb9fd5553f916c4133f376361fa76c
Merge: c74e1f5 72a97b7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 22 11:06:25 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 22 11:06:25 2016 -0400

    Merge topic 'FindCUDA-verbatim' into next
    
    72a97b7a FindCUDA: Fix regression in separate compilation (#16027)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72a97b7a761b46fd1668e3ae81dd9322972f4cb3
commit 72a97b7a761b46fd1668e3ae81dd9322972f4cb3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 22 11:04:14 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 22 11:05:02 2016 -0400

    FindCUDA: Fix regression in separate compilation (#16027)
    
    Since commit v3.5.0-rc1~47^2 (FindCUDA: Support special characters in
    path, 2016-01-15) our add_custom_command calls use VERBATIM so that
    CMake will automatically quote special characters correctly.  Fix the
    separate compilation code path to not add its own quoting when the
    VERBATIM option will be used.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 47c03f3..fe8b18e 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -1551,7 +1551,12 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options
     list( FIND nvcc_flags "-ccbin" ccbin_found0 )
     list( FIND nvcc_flags "--compiler-bindir" ccbin_found1 )
     if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 AND CUDA_HOST_COMPILER )
-      list(APPEND nvcc_flags -ccbin "\"${CUDA_HOST_COMPILER}\"")
+      # Match VERBATIM check below.
+      if(CUDA_HOST_COMPILER MATCHES "\\$\\(VCInstallDir\\)")
+        list(APPEND nvcc_flags -ccbin "\"${CUDA_HOST_COMPILER}\"")
+      else()
+        list(APPEND nvcc_flags -ccbin "${CUDA_HOST_COMPILER}")
+      endif()
     endif()
 
     # Create a list of flags specified by CUDA_NVCC_FLAGS_${CONFIG} and CMAKE_${CUDA_C_OR_CXX}_FLAGS*

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

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


hooks/post-receive
-- 
CMake