cmake: update java module install rules

This commit is contained in:
Alexander Alekhin 2013-10-04 17:48:43 +04:00
parent 4adede4246
commit bc089bb18c

View File

@ -328,9 +328,15 @@ if(ANDROID)
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()
install(TARGETS ${the_module} if(NOT INSTALL_CREATE_DISTRIB)
RUNTIME DESTINATION ${JAR_INSTALL_DIR} COMPONENT main install(TARGETS ${the_module}
LIBRARY DESTINATION ${JAR_INSTALL_DIR} COMPONENT main) RUNTIME DESTINATION ${JAR_INSTALL_DIR} COMPONENT main
LIBRARY DESTINATION ${JAR_INSTALL_DIR} COMPONENT main)
else()
install(TARGETS ${the_module}
RUNTIME DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT main
LIBRARY DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT main)
endif()
endif() endif()
###################################################################################################################################### ######################################################################################################################################