Merge pull request #10001 from alalek:cmake_exclude_java_from_cpp_modules

This commit is contained in:
Alexander Alekhin 2017-11-07 13:35:00 +00:00
commit 888d0cda40

View File

@ -485,11 +485,11 @@ if(ANDROID)
ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT java)
else()
if(NOT INSTALL_CREATE_DISTRIB)
ocv_install_target(${the_module} OPTIONAL EXPORT OpenCVModules
ocv_install_target(${the_module} OPTIONAL
RUNTIME DESTINATION ${OPENCV_JAR_INSTALL_PATH} COMPONENT java
LIBRARY DESTINATION ${OPENCV_JAR_INSTALL_PATH} COMPONENT java)
else()
ocv_install_target(${the_module} OPTIONAL EXPORT OpenCVModules
ocv_install_target(${the_module} OPTIONAL
RUNTIME DESTINATION ${OPENCV_JAR_INSTALL_PATH}/${OpenCV_ARCH} COMPONENT java
LIBRARY DESTINATION ${OPENCV_JAR_INSTALL_PATH}/${OpenCV_ARCH} COMPONENT java)
endif()