From 3b5e5113f90c48f22f7fa21c6270f1f6bf3df371 Mon Sep 17 00:00:00 2001 From: Felix Kauselmann <2039670+selmf@users.noreply.github.com> Date: Thu, 1 Mar 2018 20:24:39 +0100 Subject: [PATCH] Fix headless server builds with embedded unarr --- compressed_archive/unarr/unarr-wrapper.pri | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/compressed_archive/unarr/unarr-wrapper.pri b/compressed_archive/unarr/unarr-wrapper.pri index c8f10d8d..9e6a53b9 100644 --- a/compressed_archive/unarr/unarr-wrapper.pri +++ b/compressed_archive/unarr/unarr-wrapper.pri @@ -6,19 +6,17 @@ HEADERS += $$PWD/extract_delegate.h \ SOURCES += $$PWD/compressed_archive.cpp -unix:!macx { - !contains(QT_CONFIG, no-pkg-config):packagesExist(libunarr) { - message(Using system provided unarr installation found by pkg-config.) - CONFIG += link_pkgconfig - PKGCONFIG += libunarr - DEFINES += use_unarr - } - else:exists(/usr/include/unarr.h) { - message(Using system provided unarr installation.) - LIBS += -lunarr - DEFINES += use_unarr - } +unix:!macx:!contains(QT_CONFIG, no-pkg-config):packagesExist(libunarr) { + message(Using system provided unarr installation found by pkg-config.) + CONFIG += link_pkgconfig + PKGCONFIG += libunarr + DEFINES += use_unarr } +else:unix:!macx:exists(/usr/include/unarr.h) { + message(Using system provided unarr installation.) + LIBS += -lunarr + DEFINES += use_unarr +} else:macx:exists(../../dependencies/unarr/macx/libunarr.a) { message(Found prebuilt unarr library in dependencies directory.)