X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fopencv_build;h=20d6ea167b53de0cdb662ad71481fe9543ee71c8;hb=d8826089d59cfb265bc26745c764dcb2a756df63;hp=91950aaf91fc3ed047836389a07a122b7295ed2a;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/opencv_build b/cinelerra-5.1/opencv_build index 91950aaf..20d6ea16 100644 --- a/cinelerra-5.1/opencv_build +++ b/cinelerra-5.1/opencv_build @@ -75,6 +75,7 @@ $(opencv)/build: $(opencv).src cd $@ && cmake \ -DCMAKE_BUILD_TYPE=RELEASE \ -DWITH_IPP=OFF \ + -DWITH_LAPACK=OFF \ -DBUILD_SHARED_LIBS=OFF \ -DINSTALL_C_EXAMPLES=OFF \ -DINSTALL_PYTHON_EXAMPLES=OFF \ @@ -83,7 +84,6 @@ $(opencv)/build: $(opencv).src -DCMAKE_INSTALL_PREFIX=/usr/local \ -DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/" -LFLAGS += -llapack -lcblas LFLAGS += -Wl,--start-group LFLAGS += $(shell find $(opencv_prefix)/lib* -name "libopencv_*.a" 2> /dev/null) #opencv4 breaks SIFT/SURF findobj @@ -96,6 +96,7 @@ $(opencv)/build: $(opencv).src cd $@ && cmake \ -DCMAKE_BUILD_TYPE=RELEASE \ -DWITH_IPP=OFF \ + -DWITH_LAPACK=OFF \ -DBUILD_SHARED_LIBS=ON \ -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ @@ -104,7 +105,6 @@ $(opencv)/build: $(opencv).src -DCMAKE_INSTALL_PREFIX=/usr/local \ -DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/" -LFLAGS += -llapack -lcblas SYSLIB := $(lastword $(wildcard /usr/lib /usrlib32 /usr/lib64)) CVLIBS := $(dir (shell find $(opencv_prefix) -name libopencv_core.a)) LFLAGS += -L$(CVLIBS) $(patsubst $(CVLIBS)/lib%.so,-l%,$(wildcard $(CVLIBS)/libopencv_*.so))