Skip to content
Permalink
Browse files

fix 3d build on debian unstable

  • Loading branch information
jef-n committed Jun 26, 2020
1 parent 028f87f commit b726848e3883c6f613d0cfb3bbbb51054dc0426e
Showing with 2 additions and 2 deletions.
  1. +1 −1 CMakeLists.txt
  2. +1 −1 debian/rules
@@ -401,7 +401,7 @@ IF(WITH_CORE)
FIND_PACKAGE(Qt5WebKitWidgets REQUIRED)
ENDIF(WITH_QTWEBKIT)
IF (WITH_3D)
FIND_PACKAGE(Qt5 COMPONENTS 3DCore 3DRender 3DInput 3DLogic 3DExtras REQUIRED)
FIND_PACKAGE(Qt5 COMPONENTS 3DCore 3DRender 3DInput 3DLogic 3DExtras REQUIRED)
SET(HAVE_3D TRUE) # used in qgsconfig.h
ENDIF (WITH_3D)
IF (APPLE)
@@ -120,7 +120,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid buster bionic eoan focal"))
-DWITH_3D=TRUE \
-DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so

ifneq (,$(findstring $(DISTRIBUTION),"sid buster eoan focal"))
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

0 comments on commit b726848

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