Peter M. Groen / openbr

Commit e9ed204795284cdfa9b90befee09a1a46cb8fa13

Authored by Charles Otto
1 parent b866f5f7

Look for OpenCV bin dir relative to the lib directory 

In windows, instead of using OpenCV_DIR, look for the opencv binaries
relative to OpenCV_LIB_DIR, this works with the pre-built opencv
distribution for windows.
Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
share/openbr/cmake/InstallDependencies.cmake
  View file @e9ed204
@@ -10,7 +10,8 @@ function(install_opencv_library lib) @@ -10,7 +10,8 @@ function(install_opencv_library lib)
10 if(NOT MSVC) 10 if(NOT MSVC)
11 set(BR_INSTALL_DEPENDENCIES_PREFIX "lib") 11 set(BR_INSTALL_DEPENDENCIES_PREFIX "lib")
12 endif() 12 endif()
13 - install(FILES ${OpenCV_DIR}/bin/${BR_INSTALL_DEPENDENCIES_PREFIX}${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}${BR_INSTALL_DEPENDENCIES_SUFFIX}.dll DESTINATION bin) 13 + list(GET OpenCV_LIB_DIR 0 cv_lib_stripped)
  14 + install(FILES ${cv_lib_stripped}/../bin/${BR_INSTALL_DEPENDENCIES_PREFIX}${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}${BR_INSTALL_DEPENDENCIES_SUFFIX}.dll DESTINATION bin)
14 else() 15 else()
15 set(OpenCV_LIB_DIR "/usr/local/lib") 16 set(OpenCV_LIB_DIR "/usr/local/lib")
16 install(FILES ${OpenCV_LIB_DIR}/lib${lib}.${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH}${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION lib) 17 install(FILES ${OpenCV_LIB_DIR}/lib${lib}.${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH}${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION lib)