Merge pull request #1697 from SpecLad:sdk-redux

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")

cmake/templates/OpenCVConfig.cmake.in

@@ -36,12 +36,13 @@
 #
 # ===================================================================================
 
-if(NOT ANDROID)
+set(modules_file_suffix "")
-  include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules.cmake)
+if(ANDROID)
-else()
+  string(REPLACE - _ modules_file_suffix "_${ANDROID_NDK_ABI_NAME}")
-  include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules-${ANDROID_NDK_ABI_NAME}.cmake)
 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