cmake: update java module install rules

bc089bb1 · Alexander Alekhin · 4adede42 · bc089bb1
Commit bc089bb1 authored Oct 04, 2013 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

CMakeLists.txt modules/java/CMakeLists.txt +9 -3

No files found.
--- 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()

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