fixed CUDA libraries installation

acyen · Jun 26, 2013 · f44f2c4 · f44f2c4
1 parent 929e8b7
commit f44f2c4
Showing 1 changed file with 26 additions and 5 deletions.
diff --git a/gpu_demos_pack/CMakeLists.txt b/gpu_demos_pack/CMakeLists.txt
@@ -56,12 +56,26 @@ if(INTALL_CUDA_LIBS)
 
         if(CMAKE_SIZEOF_VOID_P EQUAL 8)
             file(GLOB CUDART_LIB "${CUDA_BIN_DIR}/cudart64*.dll")
-            file(GLOB NPP_LIB "${CUDA_BIN_DIR}/npp64*.dll")
+            if(${CUDA_VERSION} VERSION_LESS "5.5")
+                file(GLOB NPP_LIB "${CUDA_BIN_DIR}/npp64*.dll")
+            else()
+                file(GLOB NPPC_LIB "${CUDA_BIN_DIR}/nppc64*.dll")
+                file(GLOB NPPI_LIB "${CUDA_BIN_DIR}/nppi64*.dll")
+                file(GLOB NPPS_LIB "${CUDA_BIN_DIR}/npps64*.dll")
+                set(NPP_LIB "${NPPC_LIB}" "${NPPI_LIB}" "${NPPS_LIB}")
+            endif()
             file(GLOB CUBLAS_LIB "${CUDA_BIN_DIR}/cublas64*.dll")
             file(GLOB CUFFT_LIB "${CUDA_BIN_DIR}/cufft64*.dll")
         else()
             file(GLOB CUDART_LIB "${CUDA_BIN_DIR}/cudart32*.dll")
-            file(GLOB NPP_LIB "${CUDA_BIN_DIR}/npp32*.dll")
+            if(${CUDA_VERSION} VERSION_LESS "5.5")
+                file(GLOB NPP_LIB "${CUDA_BIN_DIR}/npp32*.dll")
+            else()
+                file(GLOB NPPC_LIB "${CUDA_BIN_DIR}/nppc32*.dll")
+                file(GLOB NPPI_LIB "${CUDA_BIN_DIR}/nppi32*.dll")
+                file(GLOB NPPS_LIB "${CUDA_BIN_DIR}/npps32*.dll")
+                set(NPP_LIB "${NPPC_LIB}" "${NPPI_LIB}" "${NPPS_LIB}")
+            endif()
             file(GLOB CUBLAS_LIB "${CUDA_BIN_DIR}/cublas32*.dll")
             file(GLOB CUFFT_LIB "${CUDA_BIN_DIR}/cufft32*.dll")
         endif()
@@ -73,20 +87,27 @@ if(INTALL_CUDA_LIBS)
         endif()
 
         file(GLOB CUDART_LIB "${CUDA_LIB_DIR}/libcudart.so*")
-        file(GLOB NPP_LIB "${CUDA_LIB_DIR}/libnpp.so*")
+        if(${CUDA_VERSION} VERSION_LESS "5.5")
+            file(GLOB NPP_LIB "${CUDA_LIB_DIR}/libnpp.so*")
+        else()
+            file(GLOB NPPC_LIB "${CUDA_LIB_DIR}/libnppc.so*")
+            file(GLOB NPPI_LIB "${CUDA_LIB_DIR}/libnppi.so*")
+            file(GLOB NPPS_LIB "${CUDA_LIB_DIR}/libnpps.so*")
+            set(NPP_LIB "${NPPC_LIB}" "${NPPI_LIB}" "${NPPS_LIB}")
+        endif()
         file(GLOB CUBLAS_LIB "${CUDA_LIB_DIR}/libcublas.so*")
         file(GLOB CUFFT_LIB "${CUDA_LIB_DIR}/libcufft.so*")
     endif()
 
-    set(ALL_CUDA_LIBS ${CUDART_LIB} ${NPP_LIB})
+    set(ALL_CUDA_LIBS "${CUDART_LIB}" "${NPP_LIB}")
     if(OpenCV_USE_CUBLAS)
         list(APPEND ALL_CUDA_LIBS ${CUBLAS_LIB})
     endif()
     if(OpenCV_USE_CUFFT)
         list(APPEND ALL_CUDA_LIBS ${CUFFT_LIB})
     endif()
 
-    install(FILES ${ALL_CUDA_DLLS} DESTINATION ".")
+    install(FILES ${ALL_CUDA_LIBS} DESTINATION ".")
 endif()
 
 set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ".")