Commit c4d15f4446ff0b3767a92f4aeedf8a744e622663
1 parent
cabf9545
fixed opencv packaging
Showing
1 changed file
with
7 additions
and
13 deletions
share/openbr/cmake/InstallDependencies.cmake
| ... | ... | @@ -4,19 +4,13 @@ set(BR_INSTALL_DEPENDENCIES OFF CACHE BOOL "Install runtime dependencies.") |
| 4 | 4 | function(install_opencv_library lib) |
| 5 | 5 | if(${BR_INSTALL_DEPENDENCIES}) |
| 6 | 6 | if(CMAKE_HOST_WIN32) |
| 7 | - if(MSVC) | |
| 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) | |
| 10 | - else() | |
| 11 | - install(FILES ${OpenCV_DIR}/bin/Release/opencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin) | |
| 12 | - endif() | |
| 13 | - else() | |
| 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) | |
| 16 | - else() | |
| 17 | - install(FILES ${OpenCV_DIR}/bin/libopencv_${lib}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin) | |
| 18 | - endif() | |
| 19 | - endif() | |
| 7 | + if(${CMAKE_BUILD_TYPE} MATCHES Debug) | |
| 8 | + set(BR_INSTALL_DEPENDENCIES_SUFFIX "d") | |
| 9 | + endif() | |
| 10 | + if(NOT MSVC) | |
| 11 | + set(BR_INSTALL_DEPENDENCIES_PREFIX "lib") | |
| 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) | |
| 20 | 14 | elseif(CMAKE_HOST_APPLE) |
| 21 | 15 | set(OpenCV_LIB_DIR "/usr/local/lib") |
| 22 | 16 | install(FILES ${OpenCV_LIB_DIR}/libopencv_${lib}.${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH}.dylib DESTINATION lib) | ... | ... |