From 2a9d24323c1703c61a538eedb726647f805b5b99 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Wed, 16 Oct 2013 17:23:44 +0400 Subject: [PATCH] cmake: add opencv_java into list of exported targets (fix for android) --- modules/java/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt index 2f30d8afd2..79dd42cd4b 100644 --- a/modules/java/CMakeLists.txt +++ b/modules/java/CMakeLists.txt @@ -324,16 +324,16 @@ if(ENABLE_SOLUTION_FOLDERS) endif() if(ANDROID) - install(TARGETS ${the_module} + ocv_install_target(${the_module} EXPORT OpenCVModules LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main) else() if(NOT INSTALL_CREATE_DISTRIB) - install(TARGETS ${the_module} + ocv_install_target(${the_module} EXPORT OpenCVModules RUNTIME DESTINATION ${JAR_INSTALL_DIR} COMPONENT main LIBRARY DESTINATION ${JAR_INSTALL_DIR} COMPONENT main) else() - install(TARGETS ${the_module} + ocv_install_target(${the_module} EXPORT OpenCVModules RUNTIME DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT main LIBRARY DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT main) endif()