[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4183-g9b280f7

[Brad King]

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  9b280f7374cbf10dafc36de04732b53e3e4e27cd (commit)
       via  ef27fa6760ddcfa0add1de956a68f59b134af836 (commit)
      from  9d9bed9f8ac28de075dad33d72682a5576a16813 (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=9b280f7374cbf10dafc36de04732b53e3e4e27cd
commit 9b280f7374cbf10dafc36de04732b53e3e4e27cd
Merge: 9d9bed9 ef27fa6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 13 14:12:40 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 13 14:12:40 2013 -0400

    Merge topic 'FindCUDA-list-obj-files' into next
    
    ef27fa6 FindCUDA: Always list custom command outputs in their targets


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef27fa6760ddcfa0add1de956a68f59b134af836
commit ef27fa6760ddcfa0add1de956a68f59b134af836
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 13 10:08:43 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 13 10:08:43 2013 -0400

    FindCUDA: Always list custom command outputs in their targets
    
    CMake's intended interface for linking to explicit object files (marked
    with EXTERNAL_OBJECT) is that only those listed as target sources should
    be linked.  Drop FindCUDA's attempt to hide the .obj files from VS IDE
    project files, which depends on VS-version-specific behavior of linking
    custom command outputs that happen to be named "*.obj".  CMake puts
    external object files in a dedicated source group anyway.

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}")

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindCUDA.cmake |   17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
CMake