Skip to content

O
opencv
Commit e14dc887 authored by Andrey Pavlenko's avatar Andrey Pavlenko Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #1635 from alalek:cmake_fix_export_java

parents 28ecd54f 2a9d2432
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/java/CMakeLists.txt
View file @ e14dc887
......@@ -324,16 +324,16 @@ if(ENABLE_SOLUTION_FOLDERS)
endif()
if(ANDROID)
install(TARGETS ${the_module}
ocv_install_target(${the_module} EXPORT OpenCVModules
LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
else()
if(NOT INSTALL_CREATE_DISTRIB)
install(TARGETS ${the_module}
ocv_install_target(${the_module} EXPORT OpenCVModules
RUNTIME DESTINATION ${JAR_INSTALL_DIR} COMPONENT main
LIBRARY DESTINATION ${JAR_INSTALL_DIR} COMPONENT main)
else()
install(TARGETS ${the_module}
ocv_install_target(${the_module} EXPORT OpenCVModules
RUNTIME DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT main
LIBRARY DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT main)
endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment