Browse Source

Merge topic 'FindCUDA-vs2013-separate-compilation'

9b2f6992 FindCUDA: Fix object build rule for separate compilation on VS 2013+ (#15697)
Brad King 10 years ago
parent
commit
def5795bac
1 changed files with 2 additions and 3 deletions
  1. 2 3
      Modules/FindCUDA.cmake

+ 2 - 3
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()