qmake: Added support for linking to system zstd on Linux

Use it to enable Zstandard support in the snap release. Closes mapeditor#2850
jack416 · Jun 30, 2020 · 73c01dd · 73c01dd
1 parent 7970753
commit 73c01dd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -33,21 +33,24 @@ parts:
     qt-version: qt5
     options:
       - PREFIX=/usr
+      - SYSTEM_ZSTD=yes
       - CONFIG+=release
     override-pull: |
       snapcraftctl pull
       snapcraftctl set-version "$(git describe | cut -c 2-)"
     source: .
     build-packages:
+      - pkg-config
     # FIXME: Python plugin compiles and loads, but can't find platform libraries
-    #  - pkg-config
     #  - python-dev
       - qttools5-dev-tools
       - qtdeclarative5-dev
       - zlib1g-dev
+      - libzstd-dev
     stage-packages:
       - libqt5quick5
     #  - libpython2.7
+      - libzstd1
     after: [desktop-qt5]
 
   desktop-qt5:

diff --git a/src/libtiled/libtiled.pro b/src/libtiled/libtiled.pro
@@ -20,6 +20,13 @@ win32 {
     LIBS += -lz
 }
 
+# On Linux we support linking to system Zstandard install
+linux:contains(SYSTEM_ZSTD, yes) {
+    CONFIG += link_pkgconfig
+    PKGCONFIG += libzstd
+    DEFINES += TILED_ZSTD_SUPPORT
+}
+
 DEFINES += QT_NO_CAST_FROM_ASCII \
     QT_NO_CAST_TO_ASCII
 DEFINES += TILED_LIBRARY

diff --git a/src/tiled/tiled.pro b/src/tiled/tiled.pro
@@ -40,6 +40,11 @@ macx {
     QMAKE_RPATHDIR =
 }
 
+# On Linux we support linking to system Zstandard install
+linux:contains(SYSTEM_ZSTD, yes) {
+    DEFINES += TILED_ZSTD_SUPPORT
+}
+
 SOURCES += aboutdialog.cpp \
     abstractobjecttool.cpp \
     abstracttileselectiontool.cpp \

diff --git a/tiled.pri b/tiled.pri
@@ -6,6 +6,7 @@ isEmpty(PREFIX):PREFIX = /usr/local
 isEmpty(LIBDIR):LIBDIR = $${PREFIX}/lib
 isEmpty(RPATH):RPATH = yes
 isEmpty(INSTALL_HEADERS):INSTALL_HEADERS = no
+isEmpty(SYSTEM_ZSTD):SYSTEM_ZSTD = no
 
 macx {
     # Do a universal build when possible