[Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-190-ge0bc653

[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  e0bc653bebfe35761662ca2d8052c0a347c011f2 (commit)
       via  1911cda03efc71f97e610e0b593282c835f2d4f4 (commit)
      from  5f6fe805da87fc1d3b4b66d0e9917643b626dd15 (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=e0bc653bebfe35761662ca2d8052c0a347c011f2
commit e0bc653bebfe35761662ca2d8052c0a347c011f2
Merge: 5f6fe80 1911cda
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 17 15:25:57 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 17 15:25:57 2016 -0500

    Merge topic 'FindCUDA-verbatim' into next
    
    1911cda0 FindCUDA: Fix regression under Visual Studio generators


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1911cda03efc71f97e610e0b593282c835f2d4f4
commit 1911cda03efc71f97e610e0b593282c835f2d4f4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 17 15:14:22 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 17 15:20:56 2016 -0500

    FindCUDA: Fix regression under Visual Studio generators
    
    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.  However,
    this breaks the special `$(VCInstallDir)` placeholder used with Visual
    Studio generators.  Since we do not support preservation of such
    placeholders with VERBATIM (see issue #15001) we must fall back to not
    using VERBATIM when the placeholder is used.
    
    A better fix would be to stop using `$(VCInstallDir)` and use the value
    of `CMAKE_${CUDA_C_OR_CXX}_COMPILER` instead, but that will require
    additional semantic and documentation changes.  For now simply fix the
    regression with the above approach.
    
    Reported-by: Stephen Sorley <Stephen.Sorley at jhuapl.edu>

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 1674e2d..47c03f3 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -1456,6 +1456,11 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
         set(cuda_build_comment_string "Building NVCC (${cuda_build_type}) object ${generated_file_relative_path}")
       endif()
 
+      set(_verbatim VERBATIM)
+      if(ccbin_flags MATCHES "\\$\\(VCInstallDir\\)")
+        set(_verbatim "")
+      endif()
+
       # Build the generated file and dependency file ##########################
       add_custom_command(
         OUTPUT ${generated_file}
@@ -1474,7 +1479,7 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
           -P "${custom_target_script}"
         WORKING_DIRECTORY "${cuda_compile_intermediate_directory}"
         COMMENT "${cuda_build_comment_string}"
-        VERBATIM
+        ${_verbatim}
         )
 
       # Make sure the build system knows the file is generated.
@@ -1586,6 +1591,11 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options
       set(do_obj_build_rule FALSE)
     endif()
 
+    set(_verbatim VERBATIM)
+    if(nvcc_flags MATCHES "\\$\\(VCInstallDir\\)")
+      set(_verbatim "")
+    endif()
+
     if (do_obj_build_rule)
       add_custom_command(
         OUTPUT ${output_file}
@@ -1593,7 +1603,7 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options
         COMMAND ${CUDA_NVCC_EXECUTABLE} ${nvcc_flags} -dlink ${object_files} -o ${output_file}
         ${flags}
         COMMENT "Building NVCC intermediate link file ${output_file_relative_path}"
-        VERBATIM
+        ${_verbatim}
         )
     else()
       get_filename_component(output_file_dir "${output_file}" DIRECTORY)
@@ -1603,7 +1613,7 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options
         COMMAND ${CMAKE_COMMAND} -E echo "Building NVCC intermediate link file ${output_file_relative_path}"
         COMMAND ${CMAKE_COMMAND} -E make_directory "${output_file_dir}"
         COMMAND ${CUDA_NVCC_EXECUTABLE} ${nvcc_flags} ${flags} -dlink ${object_files} -o "${output_file}"
-        VERBATIM
+        ${_verbatim}
         )
     endif()
  endif()

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

Summary of changes:
 Modules/FindCUDA.cmake |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake