Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix 3d build on debian unstable
  • Loading branch information
jef-n committed Jun 26, 2020
1 parent 028f87f commit b726848
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion debian/rules
Expand Up @@ -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
Expand Down

0 comments on commit b726848

Please sign in to comment.