Merge pull request #2514 from asmorkalov:android_two_libs_cuda

11 years ago · bcb0ee3e4b
parent 9aa6528fd7 64d679ecb4
commit bcb0ee3e4b
1 changed files with 8 additions and 5 deletions
--- a/cmake/templates/OpenCV.mk.in
+++ b/cmake/templates/OpenCV.mk.in
@ -152,11 +152,14 @@ ifeq ($(OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_ALREADY_INCLUDED),)
    OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_ALREADY_INCLUDED:=on
 endif

-ifeq ($(OPENCV_USE_GPU_MODULE),on)
-    include $(CLEAR_VARS)
-    LOCAL_MODULE:=opencv_gpu
-    LOCAL_SRC_FILES:=$(OPENCV_LIBS_DIR)/libopencv_gpu.a
-    include $(PREBUILT_STATIC_LIBRARY)
+ifeq ($(OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_GPU_ALREADY_INCLUDED),)
+    ifeq ($(OPENCV_USE_GPU_MODULE),on)
+        include $(CLEAR_VARS)
+        LOCAL_MODULE:=opencv_gpu
+        LOCAL_SRC_FILES:=$(OPENCV_LIBS_DIR)/libopencv_gpu.a
+        include $(PREBUILT_STATIC_LIBRARY)
+    endif
+    OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_GPU_ALREADY_INCLUDED:=on
 endif

 ifeq ($(OPENCV_LOCAL_CFLAGS),)