mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 06:03:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #404 from asmorkalov:android_opencvmk_fix

Browse Source
This commit is contained in:
Andrey Kamaev 2013-02-04 15:49:48 +04:00 committed by OpenCV Buildbot
commit 7244fc1f6a
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,14 +89,20 @@ define add_opencv_camera_module
include $(PREBUILT_SHARED_LIBRARY) include $(PREBUILT_SHARED_LIBRARY)
endef endef
ifeq ($(OPENCV_INSTALL_MODULES),on) ifeq ($(OPENCV_MK_ALREADY_INCLUDED),)
$(foreach module,$(OPENCV_LIBS),$(eval $(call add_opencv_module,$(module)))) ifeq ($(OPENCV_INSTALL_MODULES),on)
endif $(foreach module,$(OPENCV_LIBS),$(eval $(call add_opencv_module,$(module))))
$(foreach module,$(OPENCV_3RDPARTY_COMPONENTS),$(eval $(call add_opencv_3rdparty_component,$(module)))) endif
$(foreach module,$(OPENCV_CAMERA_MODULES),$(eval $(call add_opencv_camera_module,$(module))))
ifneq ($(OPENCV_BASEDIR),) $(foreach module,$(OPENCV_3RDPARTY_COMPONENTS),$(eval $(call add_opencv_3rdparty_component,$(module))))
OPENCV_LOCAL_C_INCLUDES += $(foreach mod, $(OPENCV_MODULES), $(OPENCV_BASEDIR)/modules/$(mod)/include) $(foreach module,$(OPENCV_CAMERA_MODULES),$(eval $(call add_opencv_camera_module,$(module))))
ifneq ($(OPENCV_BASEDIR),)
OPENCV_LOCAL_C_INCLUDES += $(foreach mod, $(OPENCV_MODULES), $(OPENCV_BASEDIR)/modules/$(mod)/include)
endif
#turn off module installation to prevent their redefinition
OPENCV_MK_ALREADY_INCLUDED:=on
endif endif
ifeq ($(OPENCV_LOCAL_CFLAGS),) ifeq ($(OPENCV_LOCAL_CFLAGS),)