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 15db64e834f175212e4204928c19b3738e1fad3c (commit) via 26b4b63736ba26d1afce3bfae9c44954eae933a8 (commit) from 83d9bf1d8378adece81864e20ceacd7182b0f0af (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=15db64e834f175212e4204928c19b3738e1fad3c commit 15db64e834f175212e4204928c19b3738e1fad3c Merge: 83d9bf1 26b4b63 Author: James Bigler <jamesbig...@gmail.com> AuthorDate: Sun May 18 02:32:01 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sun May 18 02:32:01 2014 -0400 Merge topic 'FindCUDA.cmake/UseCUDA_NVCC_FLAGS_separableCompilation' into next 26b4b637 FindCUDA.cmake - Use CUDA_NVCC_FLAGS* for separable compilation. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26b4b63736ba26d1afce3bfae9c44954eae933a8 commit 26b4b63736ba26d1afce3bfae9c44954eae933a8 Author: James Bigler <jamesbig...@gmail.com> AuthorDate: Sun May 18 00:26:26 2014 -0600 Commit: James Bigler <jamesbig...@gmail.com> CommitDate: Sun May 18 00:26:26 2014 -0600 FindCUDA.cmake - Use CUDA_NVCC_FLAGS* for separable compilation. Previously when linking the intermediate link file for separable compilation the CUDA_NVCC_FLAGS* were not used. This caused tremendous confusion when using this feature, and I consider it to be a bug. This change should fix this. diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 7bc8d49..d50e960 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -1418,15 +1418,24 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 ) list(APPEND nvcc_flags -ccbin "\"${CUDA_HOST_COMPILER}\"") endif() + # Create a list of flags specified by CUDA_NVCC_FLAGS_${CONFIG} + set(config_specific_flags) set(flags) foreach(config ${CUDA_configuration_types}) string(TOUPPER ${config} config_upper) + # Add config specific flags + foreach(f ${CUDA_NVCC_FLAGS_${config_upper}}) + list(APPEND config_specific_flags $<$<CONFIG:${config}>:${f}>) + endforeach() set(important_host_flags) _cuda_get_important_host_flags(important_host_flags ${CMAKE_${CUDA_C_OR_CXX}_FLAGS_${config_upper}}) foreach(f ${important_host_flags}) list(APPEND flags $<$<CONFIG:${config}>:-Xcompiler> $<$<CONFIG:${config}>:${f}>) endforeach() endforeach() + # Add our general CUDA_NVCC_FLAGS with the configuration specifig flags + set(nvcc_flags ${CUDA_NVCC_FLAGS} ${config_specific_flags} ${nvcc_flags}) + file(RELATIVE_PATH output_file_relative_path "${CMAKE_BINARY_DIR}" "${output_file}") # Some generators don't handle the multiple levels of custom command ----------------------------------------------------------------------- Summary of changes: Modules/FindCUDA.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits