generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1635 from alalek:cmake_fix_export_java

Browse Source
This commit is contained in:
Andrey Pavlenko 2013-10-17 11:55:25 +04:00 committed by OpenCV Buildbot
commit e14dc887c6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/java/CMakeLists.txt
View File

@ -324,16 +324,16 @@ if(ENABLE_SOLUTION_FOLDERS)
endif() endif()
if(ANDROID) if(ANDROID)
install(TARGETS ${the_module} ocv_install_target(${the_module} EXPORT OpenCVModules
LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main) ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
else() else()
if(NOT INSTALL_CREATE_DISTRIB) if(NOT INSTALL_CREATE_DISTRIB)
install(TARGETS ${the_module} ocv_install_target(${the_module} EXPORT OpenCVModules
RUNTIME DESTINATION ${JAR_INSTALL_DIR} COMPONENT main RUNTIME DESTINATION ${JAR_INSTALL_DIR} COMPONENT main
LIBRARY DESTINATION ${JAR_INSTALL_DIR} COMPONENT main) LIBRARY DESTINATION ${JAR_INSTALL_DIR} COMPONENT main)
else() else()
install(TARGETS ${the_module} ocv_install_target(${the_module} EXPORT OpenCVModules
RUNTIME DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT main RUNTIME DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT main
LIBRARY DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT main) LIBRARY DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT main)
endif() endif()