Skip to content
Permalink
Browse files

fix f54c8fb

  • Loading branch information
jef-n committed Jul 13, 2020
1 parent 384962b commit ffe9dd554be794ca45d13acc6001edd8b2cf4d93
@@ -1 +1 @@
/usr/lib/qgis/server/libdummy.so
usr/lib/qgis/server/libdummy.so
@@ -1 +1 @@
/usr/lib/qgis/server/libwfs.so
usr/lib/qgis/server/libwfs.so
@@ -1 +1 @@
/usr/lib/qgis/server/libwfs3.so
usr/lib/qgis/server/libwfs3.so
@@ -1 +1 @@
/usr/lib/qgis/server/libwms.so
usr/lib/qgis/server/libwms.so
@@ -1 +1 @@
/usr/lib/qgis/server/libwmts.so
usr/lib/qgis/server/libwmts.so
@@ -120,7 +120,6 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid buster bionic eoan focal"))
-DWITH_3D=TRUE \
-DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so

ifneq (,$(findstring $(DISTRIBUTION),"buster eoan focal"))
$(shell test -f /usr/include/$(DEB_BUILD_MULTIARCH)/qt5/Qt3DExtras/qt3dextrasversion.h)
ifneq (0,$(.SHELLSTATUS))
# Qt3DExtras intentionally removed from debian (#895386) and in turn ubuntu
@@ -129,7 +128,6 @@ ifneq (0,$(.SHELLSTATUS))
-DQT5_3DEXTRA_INCLUDE_DIR=$(realpath external/qt3dextra-headers) \
-DQT5_3DEXTRA_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libQt53DExtras.so
endif
endif

endif

0 comments on commit ffe9dd5

Please sign in to comment.
You can’t perform that action at this time.