Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

debian packaging: include pdal support for noble-ubuntugis (fixes #58485) #58513

Merged
merged 1 commit into from
Aug 28, 2024
+13 −9
Merged

debian packaging: include pdal support for noble-ubuntugis (fixes #58485) #58513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debian/control.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Build-Depends:
qtpositioning5-dev,
qttools5-dev-tools,
qttools5-dev,
#jammy bullseye# libpdal-dev, pdal,
#pdal# libpdal-dev, pdal,
libprotobuf-dev,
protobuf-compiler,
libzstd-dev,
Expand Down
4 changes: 2 additions & 2 deletions debian/qgis-providers.install.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
usr/lib/qgis/crssync
#jammy bullseye#usr/lib/qgis/untwine
#pdal#usr/lib/qgis/untwine
#pdal_wrench#usr/lib/qgis/pdal_wrench
usr/lib/qgis/plugins/libauthmethod_apiheader.so
usr/lib/qgis/plugins/libauthmethod_awss3.so
Expand All @@ -16,7 +16,7 @@ usr/lib/qgis/plugins/libprovider_gpx.so
usr/lib/qgis/plugins/libprovider_hana.so
usr/lib/qgis/plugins/libprovider_mdal.so
usr/lib/qgis/plugins/libprovider_mssql.so
#jammy bullseye#usr/lib/qgis/plugins/libprovider_pdal.so
#pdal#usr/lib/qgis/plugins/libprovider_pdal.so
usr/lib/qgis/plugins/libprovider_postgres.so
usr/lib/qgis/plugins/libprovider_postgresraster.so
usr/lib/qgis/plugins/libprovider_spatialite.so
Expand Down
16 changes: 10 additions & 6 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,6 @@ ifneq ($(SHA),)
CMAKE_OPTS += -DSHA=$(SHA)
endif

ifneq (,$(findstring $(DISTRIBUTION),"jammy bullseye"))
CMAKE_OPTS += -DWITH_PDAL=TRUE
else
CMAKE_OPTS += -DWITH_PDAL=FALSE
endif

ifneq (,$(findstring ;$(GRASSVER);, ";7;8;"))
CMAKE_OPTS += \
-DWITH_GRASS=TRUE \
Expand Down Expand Up @@ -195,6 +189,16 @@ endif

CONTROL_EXPRESSIONS = $(DISTRIBUTION) grass$(GRASSVER)

ifneq (,$(findstring $(DISTRIBUTION),"jammy bullseye"))
CONTROL_EXPRESSIONS += pdal
CMAKE_OPTS += -DWITH_PDAL=TRUE
else ifneq (,$(findstring -noble-ubuntugis-,$(DEB_BUILD_NAME)))
CONTROL_EXPRESSIONS += pdal
CMAKE_OPTS += -DWITH_PDAL=TRUE
else
CMAKE_OPTS += -DWITH_PDAL=FALSE
endif

ifneq (,$(WITH_ORACLE))
CONTROL_EXPRESSIONS += oracle
endif
Expand Down
Loading