diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-21 13:29:04 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-21 13:29:04 (GMT) |
| commit | def5795bac507ca15f40f46ba3024e81fdcc150b (patch) | |
| tree | ac43a3a00d847da514fd95e2a71b01197d4f1eff /Modules | |
| parent | c450686ef20597d43d4f019b315275cc8a6ba4a2 (diff) | |
| parent | 9b2f69925a59ac5bafdfafb650a2f2f785348085 (diff) | |
| download | CMake-def5795bac507ca15f40f46ba3024e81fdcc150b.zip CMake-def5795bac507ca15f40f46ba3024e81fdcc150b.tar.gz CMake-def5795bac507ca15f40f46ba3024e81fdcc150b.tar.bz2 | |
Merge topic 'FindCUDA-vs2013-separate-compilation'
9b2f6992 FindCUDA: Fix object build rule for separate compilation on VS 2013+ (#15697)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindCUDA.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
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() |