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 b63f40e4c616204ff4950163728dd1951eb86f6a (commit)
via e88217ce79bdf06868b0781861a4942e01f4b424 (commit)
from 88d5275bd2d8d342d6a3ee4c149f8347120be66b (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=b63f40e4c616204ff4950163728dd1951eb86f6a
commit b63f40e4c616204ff4950163728dd1951eb86f6a
Merge: 88d5275 e88217c
Author: James Bigler <[email protected]>
AuthorDate: Mon Apr 20 14:39:58 2015 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Mon Apr 20 14:39:58 2015 -0400
Merge topic 'FindCUDA.cmake/Fix-MakeDirDuringSeparableCompilation' into next
e88217ce Fix Bug 0015016 - Create output dir while compiling intermediate
link file.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e88217ce79bdf06868b0781861a4942e01f4b424
commit e88217ce79bdf06868b0781861a4942e01f4b424
Author: James Bigler <[email protected]>
AuthorDate: Thu Apr 16 10:27:23 2015 -0600
Commit: James Bigler <[email protected]>
CommitDate: Mon Apr 20 12:37:41 2015 -0600
Fix Bug 0015016 - Create output dir while compiling intermediate link file.
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.
Fix provided 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:
Modules/FindCUDA.cmake | 2 ++
1 file changed, 2 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
