From 6e8b4e646aa414df45091a43b44848baedc76c69 Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <no@email>
Date: Fri, 17 Jun 2011 11:10:35 +0000
Subject: [PATCH] Fixed Android install target

---
 CMakeLists.txt                       |  4 ++--
 OpenCVConfig.cmake.in                | 30 ++++++++++++++----------------
 modules/androidcamera/CMakeLists.txt |  4 ++++
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 282ece7..c58824b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1167,10 +1167,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINA
 # -------------------------------------------------------------------------------------------
 # Set CMAKE_INCLUDE_DIRS_CONFIGCMAKE to the list of include directories:
 
-set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/include/opencv" "${CMAKE_INSTALL_PREFIX}/include")
+set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/../../include/opencv" "\${THIS_OPENCV_CONFIG_PATH}/../../include\"")
 set(CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE "\"\"")
 
-set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib")
+set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/../../lib\"")
 
 exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"" OUTPUT_VARIABLE RET_VAL)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
diff --git a/OpenCVConfig.cmake.in b/OpenCVConfig.cmake.in
index cac601b..10dceaa 100644
--- a/OpenCVConfig.cmake.in
+++ b/OpenCVConfig.cmake.in
@@ -91,14 +91,10 @@ endif(NOT @CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE@ STREQUAL  "")
 #  many more dependencies:
 IF (NOT @BUILD_SHARED_LIBS@)
     # Under static libs, the user of OpenCV needs access to the 3rdparty libs as well:
-    LINK_DIRECTORIES(@CMAKE_LIB_DIRS_CONFIGCMAKE@/../3rdparty/lib)
-    if(WIN32)
+    if(WIN32 AND NOT ANDROID)
         LINK_DIRECTORIES(@CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE@/3rdparty/lib)
-    elseif(ANDROID)
-        LINK_DIRECTORIES(@CMAKE_BINARY_DIR@/3rdparty/lib)
-        LINK_DIRECTORIES(@CMAKE_LIB_DIRS_CONFIGCMAKE@/3rdparty/lib)
     else()
-        LINK_DIRECTORIES(@CMAKE_LIB_DIRS_CONFIGCMAKE@/../share/opencv/3rdparty/lib)
+        LINK_DIRECTORIES("${THIS_OPENCV_CONFIG_PATH}/3rdparty/lib")
     endif()    
 
     set(OpenCV_LIBS @OPENCV_LINKER_LIBS@ @IPP_LIBS@ @HIGHGUI_LIBRARIES@ ${OpenCV_LIBS})
@@ -122,16 +118,18 @@ ENDIF(NOT @BUILD_SHARED_LIBS@)
 # ======================================================
 IF (ANDROID)
   macro( COPY_NATIVE_CAMERA_LIBS target )
-    get_target_property(target_location ${target} LOCATION)
-    get_filename_component(target_location "${target_location}" PATH)
-    file(GLOB camera_wrappers "${OpenCV_LIB_DIR}/libnative_camera_r*.so")
-    foreach(wrapper ${camera_wrappers})
-        ADD_CUSTOM_COMMAND(
-          TARGET ${target}
-          POST_BUILD
-          COMMAND ${CMAKE_COMMAND} -E copy "${wrapper}" "${target_location}"
-          )
-    endforeach()
+    IF( ARMEABI_V7A)
+      get_target_property(target_location ${target} LOCATION)
+      get_filename_component(target_location "${target_location}" PATH)
+      file(GLOB camera_wrappers "${OpenCV_LIB_DIR}/libnative_camera_r*.so")
+      foreach(wrapper ${camera_wrappers})
+          ADD_CUSTOM_COMMAND(
+            TARGET ${target}
+            POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy "${wrapper}" "${target_location}"
+            )
+      endforeach()
+    ENDIF( ARMEABI_V7A )
   endmacro()
 ENDIF(ANDROID)
 
diff --git a/modules/androidcamera/CMakeLists.txt b/modules/androidcamera/CMakeLists.txt
index 751bbec..ed0d4d0 100644
--- a/modules/androidcamera/CMakeLists.txt
+++ b/modules/androidcamera/CMakeLists.txt
@@ -45,4 +45,8 @@ foreach(wrapper ${camera_wrappers})
       POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E copy "${wrapper}" "${LIBRARY_OUTPUT_PATH}"
   )
+  get_filename_component(wrapper_name "${wrapper}" NAME)
+  install(FILES "${LIBRARY_OUTPUT_PATH}/${wrapper_name}"
+        DESTINATION lib
+        COMPONENT main)
 endforeach()
\ No newline at end of file
-- 
2.7.4