[Git][debian-gis-team/qgis][master] Fix test for missing qt3dextras headers.
Bas Couwenberg
gitlab at salsa.debian.org
Tue May 19 04:47:52 BST 2020
Bas Couwenberg pushed to branch master at Debian GIS Project / qgis
Commits:
a770ad17 by Bas Couwenberg at 2020-05-19T05:47:38+02:00
Fix test for missing qt3dextras headers.
- - - - -
1 changed file:
- debian/rules
Changes:
=====================================
debian/rules
=====================================
@@ -125,7 +125,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid buster bionic eoan focal"))
ifneq (,$(findstring $(DISTRIBUTION),"sid buster eoan focal"))
# Qt3DExtras intentionally removed from debian (#895386) and in turn ubuntu
-ifneq (0,$(shell ls /usr/include/$(DEB_BUILD_MULTIARCH)/qt5/Qt3DExtras/qt3dextrasversion.h 2> /dev/null | grep -c qt3dextrasversion.h))
+ifeq (0,$(shell ls /usr/include/$(DEB_BUILD_MULTIARCH)/qt5/Qt3DExtras/qt3dextrasversion.h 2> /dev/null | grep -c qt3dextrasversion.h))
CMAKE_OPTS += \
-DCMAKE_PREFIX_PATH=$(realpath external/qt3dextra-headers/cmake) \
-DQT5_3DEXTRA_INCLUDE_DIR=$(realpath external/qt3dextra-headers) \
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/commit/a770ad171590058bfc7284916c422fded3771d41
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/commit/a770ad171590058bfc7284916c422fded3771d41
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200519/3963b1f8/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list