Commit df25daf0505cac41d821d4b685a319ad19786691
1 parent
02743edc
cleaned up opencv dependencies
Showing
2 changed files
with
6 additions
and
11 deletions
CMakeLists.txt
| ... | ... | @@ -70,8 +70,8 @@ set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${Qt5Core_QTMAIN_LIBRARIES}) |
| 70 | 70 | |
| 71 | 71 | # Find OpenCV |
| 72 | 72 | find_package(OpenCV REQUIRED) |
| 73 | -set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${OpenCV_LIBS}) | |
| 74 | -set(OPENCV_DEPENDENCIES calib3d contrib core features2d flann gpu highgui imgproc legacy ml nonfree objdetect photo stitching video videostab) | |
| 73 | +set(OPENCV_DEPENDENCIES opencv_core opencv_features2d opencv_flann opencv_highgui opencv_imgproc opencv_ml opencv_nonfree opencv_objdetect opencv_photo) | |
| 74 | +set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${OPENCV_DEPENDENCIES}) | |
| 75 | 75 | |
| 76 | 76 | # Find NaturalStringCompare |
| 77 | 77 | find_package(NaturalStringCompare REQUIRED) | ... | ... |
share/openbr/cmake/InstallDependencies.cmake
| ... | ... | @@ -10,17 +10,12 @@ 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}opencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}${BR_INSTALL_DEPENDENCIES_SUFFIX}.dll DESTINATION bin) | |
| 14 | - elseif(CMAKE_HOST_APPLE) | |
| 15 | - set(OpenCV_LIB_DIR "/usr/local/lib") | |
| 16 | - install(FILES ${OpenCV_LIB_DIR}/libopencv_${lib}.${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH}.dylib DESTINATION lib) | |
| 17 | - install(FILES ${OpenCV_LIB_DIR}/libopencv_${lib}.${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.dylib DESTINATION lib) | |
| 18 | - install(FILES ${OpenCV_LIB_DIR}/libopencv_${lib}.dylib DESTINATION lib) | |
| 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) | |
| 19 | 14 | else() |
| 20 | 15 | set(OpenCV_LIB_DIR "/usr/local/lib") |
| 21 | - install(FILES ${OpenCV_LIB_DIR}/libopencv_${lib}.so.${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH} DESTINATION lib) | |
| 22 | - install(FILES ${OpenCV_LIB_DIR}/libopencv_${lib}.so.${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR} DESTINATION lib) | |
| 23 | - install(FILES ${OpenCV_LIB_DIR}/libopencv_${lib}.so DESTINATION 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}${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION lib) | |
| 18 | + install(FILES ${OpenCV_LIB_DIR}/lib${lib}${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION lib) | |
| 24 | 19 | endif() |
| 25 | 20 | endif() |
| 26 | 21 | endfunction() | ... | ... |