From db35fe1013705b0e34613a5ced52cef069cde0fe Mon Sep 17 00:00:00 2001 From: Felix Kauselmann <2039670+selmf@users.noreply.github.com> Date: Sun, 18 Feb 2018 11:57:48 +0100 Subject: [PATCH] Fix library detection for linux systems that don't provide pkg-config support in qmake. --- compressed_archive/unarr/unarr-wrapper.pri | 2 +- dependencies/pdf_backend.pri | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compressed_archive/unarr/unarr-wrapper.pri b/compressed_archive/unarr/unarr-wrapper.pri index 56cfe401..c8f10d8d 100644 --- a/compressed_archive/unarr/unarr-wrapper.pri +++ b/compressed_archive/unarr/unarr-wrapper.pri @@ -13,7 +13,7 @@ unix:!macx { PKGCONFIG += libunarr DEFINES += use_unarr } - else:exists(/usr/include/unarr.h):exists(/usr/lib/libunarr.so) { + else:exists(/usr/include/unarr.h) { message(Using system provided unarr installation.) LIBS += -lunarr DEFINES += use_unarr diff --git a/dependencies/pdf_backend.pri b/dependencies/pdf_backend.pri index f0f9e4e6..0851b0aa 100644 --- a/dependencies/pdf_backend.pri +++ b/dependencies/pdf_backend.pri @@ -22,10 +22,10 @@ CONFIG(pdfium) { message(Using system provided installation of libpdfium found by pkg-config.) CONFIG += link_pkgconfig PKGCONFIG += libpdfium - } else:exists(/usr/include/pdfium):exists(/usr/lib/libpdfium.so) { + } else:exists(/usr/include/pdfium) { message(Using libpdfium found at /usr/lib/pdfium) INCLUDEPATH += /usr/include/pdfium - LIBS += -L/usr/lib/pdfium -lpdfium + LIBS += -lpdfium } else { error(Could not find libpdfium.) } @@ -58,10 +58,10 @@ CONFIG(poppler) { message("Using system provided installation of poppler-qt5 found by pkg-config.") CONFIG += link_pkgconfig PKGCONFIG += poppler-qt5 - } else:!macx:exists(/usr/include/poppler/qt5):exists(/usr/lib/libpoppler-qt5) { + } else:!macx:exists(/usr/include/poppler/qt5) { message("Using system provided installation of poppler-qt5.") INCLUDEPATH += /usr/include/poppler/qt5 - LIBS += -L/usr/lib -lpoppler-qt5 + LIBS += -lpoppler-qt5 } else { error("Could not find poppler-qt5") }