From c764d428b4c43959bdcc362047d647da342510fa Mon Sep 17 00:00:00 2001 From: Felix Kauselmann <2039670+selmf@users.noreply.github.com> Date: Thu, 28 Jan 2016 21:55:26 +0100 Subject: [PATCH] fix build config check --- YACReaderLibrary/YACReaderLibraryServer.pro | 25 ++------ YACReaderLibrary/headless_config.pri | 67 +++++++++++++++++++++ 2 files changed, 73 insertions(+), 19 deletions(-) create mode 100644 YACReaderLibrary/headless_config.pri diff --git a/YACReaderLibrary/YACReaderLibraryServer.pro b/YACReaderLibrary/YACReaderLibraryServer.pro index 22921f5e..42cf0a61 100644 --- a/YACReaderLibrary/YACReaderLibraryServer.pro +++ b/YACReaderLibrary/YACReaderLibraryServer.pro @@ -14,21 +14,8 @@ INCLUDEPATH += ../common \ DEFINES += SERVER_RELEASE NOMINMAX YACREADER_LIBRARY QT_NO_DEBUG_OUTPUT #load default build flags -#TODO include (../config.pri) -!CONFIG(unarr):!CONFIG(7zip) { - unix { - !macx { - CONFIG+=unarr - } - else { - CONFIG+=7zip - } - - } - win32 { - CONFIG+=7zip - } -} +#do a basic dependency check +include(headless_config.pri) win32 { LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32 -lshell32 -luser32 @@ -148,9 +135,9 @@ INSTALLS += bin server translation #manpage bin.path = $$BINDIR isEmpty(DESTDIR) { - bin.files = YACReaderLibrary + bin.files = YACReaderLibraryServer } else { - bin.files = $$DESTDIR/YACReaderLibrary + bin.files = $$DESTDIR/YACReaderLibraryServer } server.path = $$DATADIR/yacreader @@ -159,6 +146,6 @@ server.files = ../release/server translation.path = $$DATADIR/yacreader/languages translation.files = ../release/languages/yacreaderlibrary_* -manpage.path = $$DATADIR/man/man1 -manpage.files = ../YACReaderLibrary.1 +#manpage.path = $$DATADIR/man/man1 +#manpage.files = ../YACReaderLibrary.1 } diff --git a/YACReaderLibrary/headless_config.pri b/YACReaderLibrary/headless_config.pri new file mode 100644 index 00000000..cd84eecc --- /dev/null +++ b/YACReaderLibrary/headless_config.pri @@ -0,0 +1,67 @@ +#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) + +lessThan(QT_VER_MAJ, 5) { +error(YACReader requires Qt 5 or newer but Qt $$[QT_VERSION] was detected.) + } +lessThan(QT_VER_MIN, 3){ + error ("You need at least Qt 5.3 to build YACReader or YACReaderLibrary") + } +!CONFIG(unarr):!CONFIG(7zip) { + unix { + !macx { + CONFIG+=unarr + } + else { + CONFIG+=7zip + } + + } + win32 { + CONFIG+=7zip + } +} + +packagesExist(QtCore) { + message("Found QtCore") + } + else: { + error("Missing dependency: QtCore") + } +packagesExist(QtGui) { + message("Found QtGui") + } + else: { + error("Missing dependency: QtGui") + } +packagesExist(poppler-qt5) { + message("Found poppler-qt5") + } + else: { + error("Missing dependency: poppler-qt5") + } +packagesExist(QtNetwork) { + message("Found QtNetwork") + } + else: { + error("Missing dependency: QtNetwork") + } +packagesExist(QtSql) { + message("Found QtSql") + } + else: { + error("Missing dependency: QtSql") + } +packagesExist(sqlite3) { + message("Found sqlite3") + } + else: { + error("Missing dependency: sqlite3") + } \ No newline at end of file