Commit 4e21bc9d01944935cef9ed0633b332c67e47da07
1 parent
c722968d
Install dependencies correctly on Linux
Showing
1 changed file
with
10 additions
and
2 deletions
share/openbr/cmake/InstallDependencies.cmake
| ... | ... | @@ -12,11 +12,16 @@ function(install_opencv_library lib) |
| 12 | 12 | endif() |
| 13 | 13 | list(GET OpenCV_LIB_DIR 0 cv_lib_stripped) |
| 14 | 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) |
| 15 | - else() | |
| 15 | + elseif(CMAKE_HOST_APPLE) | |
| 16 | 16 | set(OpenCV_LIB_DIR "/usr/local/lib") |
| 17 | 17 | install(FILES ${OpenCV_LIB_DIR}/lib${lib}.${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH}${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION lib) |
| 18 | 18 | install(FILES ${OpenCV_LIB_DIR}/lib${lib}.${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION lib) |
| 19 | 19 | install(FILES ${OpenCV_LIB_DIR}/lib${lib}${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION lib) |
| 20 | + else() | |
| 21 | + set(OpenCV_LIB_DIR "/usr/local/lib") | |
| 22 | + install(FILES ${OpenCV_LIB_DIR}/lib${lib}${CMAKE_SHARED_LIBRARY_SUFFIX}.${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH} DESTINATION lib) | |
| 23 | + install(FILES ${OpenCV_LIB_DIR}/lib${lib}${CMAKE_SHARED_LIBRARY_SUFFIX}.${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR} DESTINATION lib) | |
| 24 | + install(FILES ${OpenCV_LIB_DIR}/lib${lib}${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION lib) | |
| 20 | 25 | endif() |
| 21 | 26 | endif() |
| 22 | 27 | endfunction() |
| ... | ... | @@ -59,9 +64,12 @@ function(install_qt_imageformats) |
| 59 | 64 | if(CMAKE_HOST_WIN32) |
| 60 | 65 | set(INSTALL_DEPENDENCIES_PREFIX "") |
| 61 | 66 | set(INSTALL_DEPENDENCIES_EXTENSION ".dll") |
| 62 | - else() | |
| 67 | + elseif(CMAKE_HOST_APPLE) | |
| 63 | 68 | set(INSTALL_DEPENDENCIES_PREFIX "lib") |
| 64 | 69 | set(INSTALL_DEPENDENCIES_EXTENSION ".dylib") |
| 70 | + else() | |
| 71 | + set(INSTALL_DEPENDENCIES_PREFIX "lib") | |
| 72 | + set(INSTALL_DEPENDENCIES_EXTENSION ".so") | |
| 65 | 73 | endif() |
| 66 | 74 | install(FILES ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qgif${INSTALL_DEPENDENCIES_EXTENSION} |
| 67 | 75 | ${IMAGE_FORMATS_DIR}/${INSTALL_DEPENDENCIES_PREFIX}qico${INSTALL_DEPENDENCIES_EXTENSION} | ... | ... |