diff options
| author | Brad King <brad.king@kitware.com> | 2013-09-16 12:55:26 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-09-16 12:55:26 (GMT) |
| commit | 094df7c5e638f6b2c2f71ba327faca91b4c83d2f (patch) | |
| tree | 9dada81c9cca92eda04e8b914cffa7ddf5ade97c | |
| parent | 237aaafe8015b3cfc8e9124754c0036de595e12c (diff) | |
| parent | ef27fa6760ddcfa0add1de956a68f59b134af836 (diff) | |
| download | CMake-094df7c5e638f6b2c2f71ba327faca91b4c83d2f.zip CMake-094df7c5e638f6b2c2f71ba327faca91b4c83d2f.tar.gz CMake-094df7c5e638f6b2c2f71ba327faca91b4c83d2f.tar.bz2 | |
Merge topic 'FindCUDA-list-obj-files'
ef27fa6 FindCUDA: Always list custom command outputs in their targets
| -rw-r--r-- | Modules/FindCUDA.cmake | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 0390ae4..8270ad4 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -1292,22 +1292,7 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files) # Make sure the build system knows the file is generated. set_source_files_properties(${generated_file} PROPERTIES GENERATED TRUE) - # Don't add the object file to the list of generated files if we are using - # visual studio and we are attaching the build rule to the cuda file. VS - # will add our object file to the linker automatically for us. - set(cuda_add_generated_file TRUE) - - if(NOT compile_to_ptx AND CMAKE_GENERATOR MATCHES "Visual Studio" AND CUDA_ATTACH_VS_BUILD_RULE_TO_CUDA_FILE) - # Visual Studio 8 crashes when you close the solution when you don't add the object file. - if(NOT CMAKE_GENERATOR MATCHES "Visual Studio 8") - #message("Not adding ${generated_file}") - set(cuda_add_generated_file FALSE) - endif() - endif() - - if(cuda_add_generated_file) - list(APPEND _cuda_wrap_generated_files ${generated_file}) - endif() + list(APPEND _cuda_wrap_generated_files ${generated_file}) # Add the other files that we want cmake to clean on a cleanup ########## list(APPEND CUDA_ADDITIONAL_CLEAN_FILES "${cmake_dependency_file}") |