Merge pull request #1635 from alalek:cmake_fix_export_java

12 years ago · e14dc887c6
parent 28ecd54f58 2a9d24323c
commit e14dc887c6
1 changed files with 3 additions and 3 deletions
--- 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()