From f24e16f54d643a0944d7b5c3d6b13904fb78ec0b Mon Sep 17 00:00:00 2001 From: Andrey Pavlenko Date: Wed, 30 Nov 2011 13:58:42 +0000 Subject: [PATCH] adding Android-specific linking flags --- OpenCVConfig.cmake.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OpenCVConfig.cmake.in b/OpenCVConfig.cmake.in index 743aa28969..8dc7d6ee12 100644 --- a/OpenCVConfig.cmake.in +++ b/OpenCVConfig.cmake.in @@ -94,7 +94,12 @@ SET(OpenCV_LIB_COMPONENTS opencv_contrib opencv_legacy opencv_stitching opencv_g # remove modules unavailable on current platform: if(ANDROID) LIST(REMOVE_ITEM OpenCV_LIB_COMPONENTS opencv_gpu) - SET(OpenCV_LIB_COMPONENTS ${OpenCV_LIB_COMPONENTS} @OpenCV_LIB_ANDROID@) + SET(OpenCV_LIB_ANDROID @OpenCV_LIB_ANDROID@) + IF(OpenCV_LIB_ANDROID) + SET(OpenCV_LIB_COMPONENTS ${OpenCV_LIB_COMPONENTS} ${OpenCV_LIB_ANDROID}) + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--allow-shlib-undefined") + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--allow-shlib-undefined") + ENDIF() endif() if(NOT ANDROID OR OpenCV_SHARED OR NOT OpenCV_HAVE_ANDROID_CAMERA) LIST(REMOVE_ITEM OpenCV_LIB_COMPONENTS opencv_androidcamera) -- GitLab