cmake: update java module install rules

11 years ago · bc089bb18c
parent 4adede4246
commit bc089bb18c
1 changed files with 9 additions and 3 deletions
--- a/modules/java/CMakeLists.txt
+++ b/modules/java/CMakeLists.txt
@ -328,9 +328,15 @@ if(ANDROID)
          LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
          ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
 else()
-  install(TARGETS ${the_module}
-          RUNTIME DESTINATION ${JAR_INSTALL_DIR} COMPONENT main
-          LIBRARY DESTINATION ${JAR_INSTALL_DIR} COMPONENT main)
+  if(NOT INSTALL_CREATE_DISTRIB)
+    install(TARGETS ${the_module}
+            RUNTIME DESTINATION ${JAR_INSTALL_DIR} COMPONENT main
+            LIBRARY DESTINATION ${JAR_INSTALL_DIR} COMPONENT main)
+  else()
+    install(TARGETS ${the_module}
+            RUNTIME DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT main
+            LIBRARY DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT main)
+  endif()
 endif()

 ######################################################################################################################################