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

Added guard to prevent from gpu module redefinition in OpenCV.mk

Browse Source
This commit is contained in:
Alexander Smorkalov 2014-03-21 18:20:57 +04:00
parent 46d39aff68
commit 64d679ecb4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/templates/OpenCV.mk.in
View File

@ -152,12 +152,15 @@ ifeq ($(OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_ALREADY_INCLUDED),)
OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_ALREADY_INCLUDED:=on OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_ALREADY_INCLUDED:=on
endif endif
ifeq ($(OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_GPU_ALREADY_INCLUDED),)
ifeq ($(OPENCV_USE_GPU_MODULE),on) ifeq ($(OPENCV_USE_GPU_MODULE),on)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE:=opencv_gpu LOCAL_MODULE:=opencv_gpu
LOCAL_SRC_FILES:=$(OPENCV_LIBS_DIR)/libopencv_gpu.a LOCAL_SRC_FILES:=$(OPENCV_LIBS_DIR)/libopencv_gpu.a
include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
endif endif
OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_GPU_ALREADY_INCLUDED:=on
endif
ifeq ($(OPENCV_LOCAL_CFLAGS),) ifeq ($(OPENCV_LOCAL_CFLAGS),)
OPENCV_LOCAL_CFLAGS := -fPIC -DANDROID -fsigned-char OPENCV_LOCAL_CFLAGS := -fPIC -DANDROID -fsigned-char