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 eec9b0f91dac9ac4dc938c624b44ac55b69b3c1c (commit)
via b63eb05e2a0d750c08e78e915993da53e165a350 (commit)
from 43d02bf54b86076ffa4ad0bb30b087a51c0b860e (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=eec9b0f91dac9ac4dc938c624b44ac55b69b3c1c
commit eec9b0f91dac9ac4dc938c624b44ac55b69b3c1c
Merge: 43d02bf b63eb05
Author: Chuck Atkins <chuck.atk...@kitware.com>
AuthorDate: Tue May 24 10:42:28 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue May 24 10:42:28 2016 -0400
Merge topic 'find-cuda-generate' into next
b63eb05e CUDA: Use file(GENERATE) for cuda cmake scripts
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b63eb05e2a0d750c08e78e915993da53e165a350
commit b63eb05e2a0d750c08e78e915993da53e165a350
Author: Chuck Atkins <chuck.atk...@kitware.com>
AuthorDate: Tue May 24 09:15:34 2016 -0400
Commit: Chuck Atkins <chuck.atk...@kitware.com>
CommitDate: Tue May 24 10:41:07 2016 -0400
CUDA: Use file(GENERATE) for cuda cmake scripts
Instead of just configure_file, by folloing it with a file(GENERATE) the
resulting cmake scripts used by the FindCUDA for wrapping nvcc calls can
now support generator expressions in the CUDA_NVCC_FLAGS variable
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 0718116..2979f0f 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -1395,7 +1395,8 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
set(cmake_dependency_file
"${cuda_compile_intermediate_directory}/${generated_file_basename}.depend")
set(NVCC_generated_dependency_file
"${cuda_compile_intermediate_directory}/${generated_file_basename}.NVCC-depend")
set(generated_cubin_file
"${generated_file_path}/${generated_file_basename}.cubin.txt")
- set(custom_target_script
"${cuda_compile_intermediate_directory}/${generated_file_basename}.cmake")
+ set(custom_target_script_pregen
"${cuda_compile_intermediate_directory}/${generated_file_basename}.cmake.pre-gen")
+ set(custom_target_script
"${cuda_compile_intermediate_directory}/${generated_file_basename}$<$<BOOL:$<CONFIG>>:.$<CONFIG>>.cmake")
# Setup properties for obj files:
if( NOT cuda_compile_to_external_module )
@@ -1436,7 +1437,11 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
endif()
# Configure the build script
- configure_file("${CUDA_run_nvcc}" "${custom_target_script}" @ONLY)
+ configure_file("${CUDA_run_nvcc}" "${custom_target_script_pregen}" @ONLY)
+ file(GENERATE
+ OUTPUT "${custom_target_script}"
+ INPUT "${custom_target_script_pregen}"
+ )
# So if a user specifies the same cuda file as input more than once, you
# can have bad things happen with dependencies. Here we check an option
-----------------------------------------------------------------------
Summary of changes:
Modules/FindCUDA.cmake | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
