Merge pull request #8819 from Robzz:master

f935a16e · Alexander Alekhin · 0d86681b · c4a3278b · f935a16e
Commit f935a16e authored Jun 01, 2017 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

CMakeLists.txt CMakeLists.txt +5 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -701,7 +701,11 @@ if(HAVE_CUDA)
    set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${CUDA_cufft_LIBRARY})
  endif()
  foreach(p ${CUDA_LIBS_PATH})
-    set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${CMAKE_LIBRARY_PATH_FLAG}${p})
+    if(MSVC AND CMAKE_GENERATOR MATCHES "Ninja|JOM")
+      set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${CMAKE_LIBRARY_PATH_FLAG}"${p}")
+    else()
+      set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${CMAKE_LIBRARY_PATH_FLAG}${p})
+    endif()
  endforeach()
 endif()
 # ----------------------------------------------------------------------------