From: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Fri, 4 Oct 2013 13:48:43 +0000 (+0400)
Subject: cmake: update java module install rules
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1314^2~941^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc089bb18cf649ed057ac090e6b2e53e0cbb7af8;p=platform%2Fupstream%2Fopencv.git

cmake: update java module install rules
---

diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt
index b15e988..2f30d8a 100644
--- 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()
 
 ######################################################################################################################################