From 169904421c6807e2ad747741da977fd704c2754e Mon Sep 17 00:00:00 2001 From: Felix Kauselmann <2039670+selmf@users.noreply.github.com> Date: Tue, 19 Sep 2017 15:45:46 +0200 Subject: [PATCH] Use pkg-config to detect (lib)unarr on unix --- compressed_archive/unarr/unarr-wrapper.pri | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/compressed_archive/unarr/unarr-wrapper.pri b/compressed_archive/unarr/unarr-wrapper.pri index 2cfc5bd4..4f54e409 100644 --- a/compressed_archive/unarr/unarr-wrapper.pri +++ b/compressed_archive/unarr/unarr-wrapper.pri @@ -6,10 +6,11 @@ HEADERS += $$PWD/extract_delegate.h \ SOURCES += $$PWD/compressed_archive.cpp \ -unix:!macx:exists (/usr/include/unarr.h) { +unix:!macx { message(Using system provided unarr installation) - LIBS+=-lunarr - DEFINES+=use_unarr + CONFIG += link_pkgconfig + PKGCONFIG += libunarr + DEFINES += use_unarr } else:macx:exists (../../dependencies/unarr/macx/libunarr.a) { message(Found prebuilt unarr library in dependencies directory.) @@ -32,7 +33,7 @@ else:win32:exists (../../dependencies/unarr/win/unarr.h) { else:exists ($$PWD/unarr-master) { message(Found unarr source-code) message(Unarr will be build as a part of YACReader) - + #qmake based unarr build system #this should only be used for testing or as a last resort include(unarr.pro)