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

Merge pull request #3666 from mshabunin:meta-module

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-02-16 11:43:30 +00:00
parent 23633c1945 a5a510da4b
commit d509ecd19a
9 changed files with 139 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/java/CMakeLists.txt
View File

@@ -242,7 +242,7 @@ else(ANDROID)
else(WIN32)
set(JAR_INSTALL_DIR share/OpenCV/java)
endif(WIN32)
install(FILES ${JAR_FILE} DESTINATION ${JAR_INSTALL_DIR} COMPONENT java)
install(FILES ${JAR_FILE} OPTIONAL DESTINATION ${JAR_INSTALL_DIR} COMPONENT java)
endif(ANDROID)
# step 5: build native part
@@ -312,16 +312,16 @@ if(ENABLE_SOLUTION_FOLDERS)
endif()
if(ANDROID)
ocv_install_target(${the_module} EXPORT OpenCVModules
ocv_install_target(${the_module} OPTIONAL EXPORT OpenCVModules
LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT java
ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT java)
else()
if(NOT INSTALL_CREATE_DISTRIB)
ocv_install_target(${the_module} EXPORT OpenCVModules
ocv_install_target(${the_module} OPTIONAL EXPORT OpenCVModules
RUNTIME DESTINATION ${JAR_INSTALL_DIR} COMPONENT java
LIBRARY DESTINATION ${JAR_INSTALL_DIR} COMPONENT java)
else()
ocv_install_target(${the_module} EXPORT OpenCVModules
ocv_install_target(${the_module} OPTIONAL EXPORT OpenCVModules
RUNTIME DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT java
LIBRARY DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT java)
endif()

3
modules/python/common.cmake
View File

@@ -20,6 +20,7 @@ ocv_list_filterout(candidate_deps "^opencv_adas$")
ocv_list_filterout(candidate_deps "^opencv_tracking$")
ocv_list_filterout(candidate_deps "^opencv_bioinspired$")
ocv_list_filterout(candidate_deps "^opencv_java$")
ocv_list_filterout(candidate_deps "^opencv_contrib_world$")
ocv_add_module(${MODULE_NAME} BINDINGS OPTIONAL ${candidate_deps})
@@ -113,7 +114,7 @@ else()
endif()
if(NOT INSTALL_CREATE_DISTRIB)
install(TARGETS ${the_module}
install(TARGETS ${the_module} OPTIONAL
${PYTHON_INSTALL_CONFIGURATIONS}
RUNTIME DESTINATION ${PYTHON_PACKAGES_PATH} COMPONENT python
LIBRARY DESTINATION ${PYTHON_PACKAGES_PATH} COMPONENT python