[Cmake-commits] CMake branch, next, updated. v3.2.2-1962-gc45456b

[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  c45456ba932b319cff57d24d69a17d5b18293eef (commit)
       via  0ed22502a6057f989bc7855a5a69e5171e013048 (commit)
      from  f899c66571397eb670a3679d579f094fe5ab8383 (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=c45456ba932b319cff57d24d69a17d5b18293eef
commit c45456ba932b319cff57d24d69a17d5b18293eef
Merge: f899c66 0ed2250
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 20 14:46:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 20 14:46:00 2015 -0400

    Merge topic 'FindCUDA.cmake/Fix-MakeDirDuringSeparableCompilation' into next
    
    0ed22502 FindCUDA: Create output dir while compiling intermediate link file (#15016)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ed22502a6057f989bc7855a5a69e5171e013048
commit 0ed22502a6057f989bc7855a5a69e5171e013048
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Thu Apr 16 10:27:23 2015 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 20 14:44:17 2015 -0400

    FindCUDA: Create output dir while compiling intermediate link file (#15016)
    
    During compilation of the intermediate link file, the output directory
    may not be present in Visual Studio builds.  This fix makes sure the
    output directory exists before generating the output file.
    
    Suggested-by: Irwin Zaid

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 1802e61..e8e1fb1 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -1585,10 +1585,12 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options
         COMMENT "Building NVCC intermediate link file ${output_file_relative_path}"
         )
     else()
+      get_filename_component(output_file_dir "${output_file}" DIRECTORY)
       add_custom_command(
         TARGET ${cuda_target}
         PRE_LINK
         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}"
         )
     endif()

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

Summary of changes:


hooks/post-receive
-- 
CMake