adaf0065a0
Other changes include: - Reformat inputs and arguments to drv. - Use autoreconfHook as upstream's generated ./configure has proved to be not reliable (it didn't detect properly missing deps). - Add many more dependencies that were detected now with autoreconfHook. - Upgrade gui dep to wxGTK31-gtk3. - Upgrade opencv dep to opencv4.
14 lines
686 B
Diff
14 lines
686 B
Diff
--- a/src/tools/imagery/imagery_opencv/Makefile.am
|
|
+++ b/src/tools/imagery/imagery_opencv/Makefile.am
|
|
@@ -7,9 +7,9 @@
|
|
|
|
if HAVE_CV
|
|
DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
|
|
-CXX_INCS = -I$(top_srcdir)/src/saga_core -I/usr/include/opencv
|
|
+CXX_INCS = -I$(top_srcdir)/src/saga_core `pkg-config opencv4 --cflags`
|
|
AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
|
|
-AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv --libs`
|
|
+AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv4 --libs`
|
|
pkglib_LTLIBRARIES = libimagery_opencv.la
|
|
libimagery_opencv_la_SOURCES =\
|
|
MLB_Interface.cpp\
|