generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmake: fix android installation for different NDK ABIs

Browse Source
This commit is contained in:
Alexander Alekhin
2013-10-24 20:01:29 +04:00
parent f177e65871
commit 7a8f9fe746
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/templates/OpenCVConfig.cmake.in
View File

@@ -36,7 +36,11 @@
#
# ===================================================================================
include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules.cmake)
if(NOT ANDROID)
include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules.cmake)
else()
include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules-${ANDROID_NDK_ABI_NAME}.cmake)
endif()
# TODO All things below should be reviewed. What is about of moving this code into related modules (special vars/hooks/files)