From 40962f753b435b3dc4bb6b08f3202722c5da5246 Mon Sep 17 00:00:00 2001 From: Felix Kauselmann <2039670+selmf@users.noreply.github.com> Date: Sat, 13 Jan 2018 10:26:24 +0100 Subject: [PATCH] Skip dependency checks in yacreaderlibraryserver if qmake isn't build with pkg-config support --- YACReaderLibraryServer/headless_config.pri | 39 +++++++--------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/YACReaderLibraryServer/headless_config.pri b/YACReaderLibraryServer/headless_config.pri index db4c9463..4e499be4 100644 --- a/YACReaderLibraryServer/headless_config.pri +++ b/YACReaderLibraryServer/headless_config.pri @@ -1,52 +1,37 @@ -#functions to automatically initialize some of YACReader's build options to -#default values if they're not set on build time -#for a more detailed description, see INSTALL.TXT - -#check Qt version -QT_VERSION = $$[QT_VERSION] -QT_VERSION = $$split(QT_VERSION, ".") -QT_VER_MAJ = $$member(QT_VERSION, 0) -QT_VER_MIN = $$member(QT_VERSION, 1) +# functions to automatically initialize some of YACReaderLibraryServer's build +# options to default values if they're not set at build time +# for a more detailed description, see INSTALL.TXT include (../config.pri) -unix { - !macx { +unix!macx { + !contains(QT_CONFIG, no-pkg-config) { packagesExist(Qt5Core) { message("Found Qt5Core") - } - else: { + } else: { message("Missing dependency: Qt5Core") } packagesExist(Qt5Gui) { message("Found Qt5Gui") - } - else: { + } else: { message("Missing dependency: Qt5Gui") } - packagesExist(poppler-qt5) { - message("Found poppler-qt5") - } - else: { - message("Missing dependency: poppler-qt5") - } packagesExist(Qt5Network) { message("Found Qt5Network") - } - else: { + } else: { message("Missing dependency: Qt5Network") } packagesExist(Qt5Sql) { message("Found Qt5Sql") - } - else: { + } else: { message("Missing dependency: Qt5Sql") } packagesExist(sqlite3) { message("Found sqlite3") - } - else: { + } else: { message("Missing dependency: sqlite3") } + } else { + message("Qmake was compiled without support for pkg-config. Skipping dependency checks.") } }