From c016c43d253596fae041685a737e6e55347ad6b1 Mon Sep 17 00:00:00 2001
From: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri, 25 Oct 2013 19:10:13 +0400
Subject: [PATCH] Fixed Android SDK build - again.
---
cmake/OpenCVGenConfig.cmake | 4 +++-
cmake/templates/OpenCVConfig.cmake.in | 9 +++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
index b7f026db2..362841b21 100644
--- a/cmake/OpenCVGenConfig.cmake
+++ b/cmake/OpenCVGenConfig.cmake
@@ -76,7 +76,9 @@ endif()
set(modules_file_suffix "")
if(ANDROID)
- set(modules_file_suffix "-${ANDROID_NDK_ABI_NAME}")
+ # the REPLACE here is needed, because OpenCVModules_armeabi.cmake includes
+ # OpenCVModules_armeabi-*.cmake, which would match OpenCVModules_armeabi-v7a*.cmake.
+ string(REPLACE - _ modules_file_suffix "_${ANDROID_NDK_ABI_NAME}")
endif()
export(TARGETS ${OpenCVModules_TARGETS} FILE "${CMAKE_BINARY_DIR}/OpenCVModules${modules_file_suffix}.cmake")
diff --git a/cmake/templates/OpenCVConfig.cmake.in b/cmake/templates/OpenCVConfig.cmake.in
index 2f2841356..ee1eb5996 100644
--- a/cmake/templates/OpenCVConfig.cmake.in
+++ b/cmake/templates/OpenCVConfig.cmake.in
@@ -36,12 +36,13 @@
#
# ===================================================================================
-if(NOT ANDROID)
- include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules.cmake)
-else()
- include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules-${ANDROID_NDK_ABI_NAME}.cmake)
+set(modules_file_suffix "")
+if(ANDROID)
+ string(REPLACE - _ modules_file_suffix "_${ANDROID_NDK_ABI_NAME}")
endif()
+include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${modules_file_suffix}.cmake)
+
# TODO All things below should be reviewed. What is about of moving this code into related modules (special vars/hooks/files)
# Version Compute Capability from which OpenCV has been compiled is remembered