From e0cce99be0a99355f7ce3cad144bf250552676c9 Mon Sep 17 00:00:00 2001 From: Felix Kauselmann Date: Sun, 6 Oct 2019 15:56:51 +0200 Subject: [PATCH 1/2] YACReaderLibraryServer: Default to bundled build. As the headless server is now part of the default build, we need to default to a bundled build to avoid packaging problems and confusion on Linux and other systems using make install. --- YACReaderLibraryServer/YACReaderLibraryServer.pro | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/YACReaderLibraryServer/YACReaderLibraryServer.pro b/YACReaderLibraryServer/YACReaderLibraryServer.pro index b3cdbae9..a9f15d5c 100644 --- a/YACReaderLibraryServer/YACReaderLibraryServer.pro +++ b/YACReaderLibraryServer/YACReaderLibraryServer.pro @@ -129,18 +129,20 @@ DATADIR = $$PREFIX/share DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\"" #make install + +!CONFIG(server_bundled):!CONFIG(server_standalone): { + CONFIG+=server_bundled + message("No build type specified. Defaulting to bundled server build (CONFIG+=server_bundled).") + message("If you wish to run YACReaderLibraryServer on a system without an existing install of YACReaderLibrary,\ + please specify CONFIG+=server_standalone as an option when running qmake to avoid missing dependencies.") +} + CONFIG(server_standalone) { INSTALLS += bin server translation systemd } else:CONFIG(server_bundled) { INSTALLS += bin systemd } -else { - INSTALLS += bin server translation systemd - message("No build type specified. Defaulting to standalone server build (CONFIG+=server_standalone).") - message("If you wish to run YACReaderLibraryServer on a system with an existing install of YACReaderLibrary,\ - please specify CONFIG+=server_bundled as an option when running qmake.") -} bin.path = $$BINDIR isEmpty(DESTDIR) { From 704a12d6a9ad376dc1e780c4c7896e60a3a4e3bc Mon Sep 17 00:00:00 2001 From: Felix Kauselmann Date: Sun, 6 Oct 2019 16:02:20 +0200 Subject: [PATCH 2/2] YACReaderLibraryServer: Don't disable Qt debug output. --- YACReaderLibraryServer/YACReaderLibraryServer.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YACReaderLibraryServer/YACReaderLibraryServer.pro b/YACReaderLibraryServer/YACReaderLibraryServer.pro index a9f15d5c..f283bdb4 100644 --- a/YACReaderLibraryServer/YACReaderLibraryServer.pro +++ b/YACReaderLibraryServer/YACReaderLibraryServer.pro @@ -10,7 +10,7 @@ INCLUDEPATH += ../YACReaderLibrary \ ../YACReaderLibrary/server \ ../YACReaderLibrary/db -DEFINES += SERVER_RELEASE NOMINMAX YACREADER_LIBRARY QT_NO_DEBUG_OUTPUT +DEFINES += SERVER_RELEASE NOMINMAX YACREADER_LIBRARY # load default build flags # do a basic dependency check include(headless_config.pri)