Commit 510b38b9fb1000efcef69881e95948b063b54ff7
Merge pull request #64 from biometrics/install_opencv_relative
Look for OpenCV bin dir relative to the lib directory
Showing
1 changed file
with
2 additions
and
1 deletions
share/openbr/cmake/InstallDependencies.cmake
| ... | ... | @@ -10,7 +10,8 @@ function(install_opencv_library lib) |
| 10 | 10 | if(NOT MSVC) |
| 11 | 11 | set(BR_INSTALL_DEPENDENCIES_PREFIX "lib") |
| 12 | 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 | 15 | else() |
| 15 | 16 | set(OpenCV_LIB_DIR "/usr/local/lib") |
| 16 | 17 | install(FILES ${OpenCV_LIB_DIR}/lib${lib}.${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH}${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION lib) | ... | ... |