[Cmake-commits] CMake branch, next, updated. v3.3.1-2292-g42f1d11

[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  42f1d1166fff8f78ca9e5e5465bbae4047a7a94f (commit)
       via  3ab78a691cb97354401bbbfc4b1658844f3896f3 (commit)
      from  0c0852b1b0fe29ad445f4f0842343c39cf8e7c13 (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=42f1d1166fff8f78ca9e5e5465bbae4047a7a94f
commit 42f1d1166fff8f78ca9e5e5465bbae4047a7a94f
Merge: 0c0852b 3ab78a6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 20 11:51:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 20 11:51:48 2015 -0400

    Merge topic 'FindCUDA-vs2013-separate-compilation' into next
    
    3ab78a69 FindCUDA: Fix object build rule for separate compilation on VS 2013+


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ab78a691cb97354401bbbfc4b1658844f3896f3
commit 3ab78a691cb97354401bbbfc4b1658844f3896f3
Author:     Dominic Meiser <dmeiser at txcorp.com>
AuthorDate: Thu Aug 20 08:28:07 2015 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 20 11:50:52 2015 -0400

    FindCUDA: Fix object build rule for separate compilation on VS 2013+
    
    The handling of multilevel dependencies has been fixed in Visual Studio 2013.
    The work around used for VS 2010 and VS 2012 does not work for VS 2013 any more.
    Switch to normal object build rules for VS 2013 and newer.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index f4b0783..1fc582f 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -1584,9 +1584,8 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options
     # we work around that issue by compiling the intermediate link object as a
     # pre-link custom command in that situation.
     set(do_obj_build_rule TRUE)
-    if (MSVC_VERSION GREATER 1599)
-      # VS 2010 and 2012 have this problem.  If future versions fix this issue,
-      # it should still work, it just won't be as nice as the other method.
+    if (MSVC_VERSION GREATER 1599 AND MSVC_VERSION LESS 1800)
+      # VS 2010 and 2012 have this problem.
       set(do_obj_build_rule FALSE)
     endif()
 

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

Summary of changes:
 Modules/FindCUDA.cmake |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake