adding Android-specific linking flags

f24e16f5 · Andrey Pavlenko · 2d815c80 · f24e16f5
隐藏空白更改
内联并排

Showing with 6 addition and 1 deletion

OpenCVConfig.cmake.in OpenCVConfig.cmake.in +6 -1

未找到文件。
--- 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)