Peter M. Groen / openbr

Commit 2a4209fbfd92914309842867b03a345741696166

Authored by Josh Klontz
1 parent 57bcd047

install debug libraries on windows fix

Inline Side-by-side
Showing 1 changed file with 7 additions and 3 deletions
share/openbr/cmake/InstallDependencies.cmake
  View file @2a4209f
@@ -5,13 +5,13 @@ function(install_opencv_library lib) @@ -5,13 +5,13 @@ function(install_opencv_library lib)
5 if(${BR_INSTALL_DEPENDENCIES}) 5 if(${BR_INSTALL_DEPENDENCIES})
6 if(CMAKE_HOST_WIN32) 6 if(CMAKE_HOST_WIN32)
7 if(MSVC) 7 if(MSVC)
8 - if(${CMAKE_BUILD_TYPE} EQUAL "Debug") 8 + if(${CMAKE_BUILD_TYPE} MATCHES Debug)
9 install(FILES ${OpenCV_DIR}/bin/Debug/opencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}d.dll DESTINATION bin) 9 install(FILES ${OpenCV_DIR}/bin/Debug/opencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}d.dll DESTINATION bin)
10 else() 10 else()
11 install(FILES ${OpenCV_DIR}/bin/Release/opencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin) 11 install(FILES ${OpenCV_DIR}/bin/Release/opencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin)
12 endif() 12 endif()
13 else() 13 else()
14 - if(${CMAKE_BUILD_TYPE} EQUAL "Debug") 14 + if(${CMAKE_BUILD_TYPE} MATCHES Debug)
15 install(FILES ${OpenCV_DIR}/bin/libopencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}d.dll DESTINATION bin) 15 install(FILES ${OpenCV_DIR}/bin/libopencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}d.dll DESTINATION bin)
16 else() 16 else()
17 install(FILES ${OpenCV_DIR}/bin/libopencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin) 17 install(FILES ${OpenCV_DIR}/bin/libopencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin)
@@ -41,7 +41,11 @@ endfunction() @@ -41,7 +41,11 @@ endfunction()
41 function(install_qt_library lib) 41 function(install_qt_library lib)
42 if(${BR_INSTALL_DEPENDENCIES}) 42 if(${BR_INSTALL_DEPENDENCIES})
43 if(CMAKE_HOST_WIN32) 43 if(CMAKE_HOST_WIN32)
44 - install(FILES ${QT_LIBRARY_DIR}/../bin/${lib}${QT_VERSION_MAJOR}.dll DESTINATION bin) 44 + if(${CMAKE_BUILD_TYPE} MATCHES Debug)
  45 + install(FILES ${QT_LIBRARY_DIR}/../bin/${lib}d${QT_VERSION_MAJOR}.dll DESTINATION bin)
  46 + else()
  47 + install(FILES ${QT_LIBRARY_DIR}/../bin/${lib}${QT_VERSION_MAJOR}.dll DESTINATION bin)
  48 + endif()
45 elseif(CMAKE_HOST_APPLE) 49 elseif(CMAKE_HOST_APPLE)
46 install(DIRECTORY ${QT_LIBRARY_DIR}/${lib}.framework DESTINATION lib) 50 install(DIRECTORY ${QT_LIBRARY_DIR}/${lib}.framework DESTINATION lib)
47 else() 51 else()