[Cmake-commits] CMake branch, next, updated. v3.4.1-1971-ga0e5995

[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  a0e599587c8ddd4898d6019fab52f01f9ddec4d3 (commit)
       via  6ccc307053f03c4c48a2cb9d5795f91d341a5c39 (commit)
      from  aea52d2033f3e17ba11af70fb6d264e8637a8deb (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=a0e599587c8ddd4898d6019fab52f01f9ddec4d3
commit a0e599587c8ddd4898d6019fab52f01f9ddec4d3
Merge: aea52d2 6ccc307
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 15 08:46:41 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 15 08:46:41 2016 -0500

    Merge topic 'FindCUDA-verbatim' into next
    
    6ccc3070 FindCUDA: Support special characters in path (#15919)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ccc307053f03c4c48a2cb9d5795f91d341a5c39
commit 6ccc307053f03c4c48a2cb9d5795f91d341a5c39
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 15 08:44:15 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 15 08:46:20 2016 -0500

    FindCUDA: Support special characters in path (#15919)
    
    Add `VERBATIM` to all `add_custom_command` calls so that CMake will
    escape arguments properly even when special characters such as "()" are
    present.
    
    Suggested-by: Nils Gladitz <nilsgladitz at gmail.com>

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index ada5b8a..1674e2d 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -1474,6 +1474,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
         )
 
       # Make sure the build system knows the file is generated.
@@ -1592,6 +1593,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
         )
     else()
       get_filename_component(output_file_dir "${output_file}" DIRECTORY)
@@ -1601,6 +1603,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
         )
     endif()
  endif()

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

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


hooks/post-receive
-- 
CMake