Merge pull request #1635 from alalek:cmake_fix_export_java
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 17 Oct 2013 07:55:25 +0000 (11:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 17 Oct 2013 07:55:25 +0000 (11:55 +0400)
modules/java/CMakeLists.txt

index 2f30d8a..79dd42c 100644 (file)
@@ -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()