Skip to content

O
opencv
Commit 7244fc1f authored by Andrey Kamaev's avatar Andrey Kamaev Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #404 from asmorkalov:android_opencvmk_fix

parents 727b6a72 e58f4e44
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 7 deletions
cmake/templates/OpenCV.mk.in
View file @ 7244fc1f
...@@ -89,14 +89,20 @@ define add_opencv_camera_module ...@@ -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))))
$(foreach module,$(OPENCV_3RDPARTY_COMPONENTS),$(eval $(call add_opencv_3rdparty_component,$(module))))
$(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
ifneq ($(OPENCV_BASEDIR),) #turn off module installation to prevent their redefinition
OPENCV_LOCAL_C_INCLUDES += $(foreach mod, $(OPENCV_MODULES), $(OPENCV_BASEDIR)/modules/$(mod)/include) OPENCV_MK_ALREADY_INCLUDED:=on
endif endif
ifeq ($(OPENCV_LOCAL_CFLAGS),) ifeq ($(OPENCV_LOCAL_CFLAGS),)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment