Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1635 from alalek:cmake_fix_export_java

Browse Source
pull/1632/merge
Andrey Pavlenko 12 years ago committed by OpenCV Buildbot
parent 28ecd54f58 2a9d24323c
commit e14dc887c6
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      modules/java/CMakeLists.txt

6
modules/java/CMakeLists.txt
Unescape 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()

Write Preview
Loading…
Cancel
Save