Fix build with CUDA on windows with JOM and Ninja (#6372)

c4a3278b · Robin Chavignat · 89fcd6d8 · c4a3278b
Commit c4a3278b authored May 29, 2017 by Robin Chavignat
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()
 # ----------------------------------------------------------------------------