Merge topic 'FindCUDA-vs2013-separate-compilation'

9b2f6992 FindCUDA: Fix object build rule for separate compilation on VS 2013+ (#15697)
This commit is contained in:
Brad King 2015-08-21 09:29:04 -04:00 committed by CMake Topic Stage
commit def5795bac
1 changed files with 2 additions and 3 deletions

View File

@ -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()