diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-25 13:34:26 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-25 13:34:26 (GMT) |
| commit | 9ebc2092885fa32eaa47aade965fcec2cfa308d0 (patch) | |
| tree | 248ac156c4c226f61eb2a44a314897f94e37a4c7 | |
| parent | 916d52533ea354d8945c0cba44f65ee34d0e7cd5 (diff) | |
| parent | 6b190b5c5221d2447bdf19c20243469025d2614e (diff) | |
| download | CMake-9ebc2092885fa32eaa47aade965fcec2cfa308d0.zip CMake-9ebc2092885fa32eaa47aade965fcec2cfa308d0.tar.gz CMake-9ebc2092885fa32eaa47aade965fcec2cfa308d0.tar.bz2 | |
Merge topic 'FindCUDA-flags-genex'
6b190b5c FindCUDA: Add support for generator expressions in CUDA_NVCC_FLAGS
| -rw-r--r-- | Modules/FindCUDA.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
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 |