diff --git a/server-sdk.pro b/server-sdk.pro index e3855b2..f595bec 100644 --- a/server-sdk.pro +++ b/server-sdk.pro @@ -1,7 +1,10 @@ TEMPLATE = subdirs +OUT_ROOT=$$OUT_PWD + + SUBDIRS += \ - src/lib \ + src/serversdk \ src/testapp \ test \ @@ -12,3 +15,5 @@ OTHER_FILES += \ doc/Doxy* \ doc/pages/* \ server-sdk.pri \ + +message($$OUT_ROOT) diff --git a/serversdk.pri b/serversdk.pri new file mode 100644 index 0000000..f0c3402 --- /dev/null +++ b/serversdk.pri @@ -0,0 +1,33 @@ +message("OUT_PWD :" $$OUT_PWD) +message("PWD :" $$PWD) +message("_PRO_FILE_PWD_ :" $$_PRO_FILE_PWD_) + +# Getting 'subpath' +# +# in: /Users/fbucek/Documents/Spaceti/common/server-sdk/src/testapp +# out: /src/testapp +SUBPATH=$$_PRO_FILE_PWD_ +SUBPATH=$$replace(SUBPATH, $$PWD, "") +message("SUBPATH :" $$SUBPATH) + +# Getting 'base root output' +# +# in: /Users/fbucek/_temp_/build-server-sdk-5_9_8-Debug/src/testapp +# out: /Users/fbucek/_temp_/build-server-sdk-5_9_8-Debug +ROOT_OUT=$$OUT_PWD +ROOT_OUT=$$replace(OUT_PWD, $$SUBPATH, "") +message("ROOT_OUT :" $$ROOT_OUT) + +win32:CONFIG(release, debug|release): LIBS += -L$$ROOT_OUT/src/serversdk/release/ -lserversdk +else:win32:CONFIG(debug, debug|release): LIBS += -L$$ROOT_OUT/src/serversdk/debug/ -lserversdk +else:unix: LIBS += -L$$ROOT_OUT/src/serversdk/ -lserversdk + + +INCLUDEPATH += $$PWD/src/ +DEPENDPATH += $$PWD/src/serversdk + +win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$ROOT_OUT/src/serversdk/release/libserversdk.a +else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$ROOT_OUT/src/serversdk/debug/libserversdk.a +else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$ROOT_OUT/src/serversdk/release/serversdk.lib +else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$ROOT_OUT/src/serversdk/debug/serversdk.lib +else:unix: PRE_TARGETDEPS += $$ROOT_OUT/src/serversdk/libserversdk.a diff --git a/src/serversdk/core.h b/src/serversdk/core.h index c98b983..41bb169 100644 --- a/src/serversdk/core.h +++ b/src/serversdk/core.h @@ -1,6 +1,6 @@ #pragma once -#include "serversdk/logger.h" +#include "logger.h" // Qt #include diff --git a/src/serversdk/serversdk.pri b/src/serversdk/serversdk.pro similarity index 82% rename from src/serversdk/serversdk.pri rename to src/serversdk/serversdk.pro index 214cf89..d96b9b1 100644 --- a/src/serversdk/serversdk.pri +++ b/src/serversdk/serversdk.pro @@ -1,6 +1,12 @@ -INCLUDEPATH += $$PWD/.. +TEMPLATE = lib + +QT += core sql network + +CONFIG += static CONFIG += c++14 +INCLUDEPATH += $$PWD + SOURCES += \ $$PWD/core.cpp \ $$PWD/databasemanager.cpp \ @@ -21,3 +27,5 @@ HEADERS += \ # TODO: implement zlib compression # include (zlib.pri) + +message($$OUT_ROOT) diff --git a/src/testapp/app.pro b/src/testapp/app.pro deleted file mode 100644 index 099fd82..0000000 --- a/src/testapp/app.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = lib - -QT += core sql network -CONFIG += debug console - -include(../core/core.pri) diff --git a/src/testapp/testapp.pro b/src/testapp/testapp.pro index 1e89919..2435d3a 100644 --- a/src/testapp/testapp.pro +++ b/src/testapp/testapp.pro @@ -4,4 +4,7 @@ QT += core sql network SOURCES += main.cpp -include(../serversdk/serversdk.pri) +OUTBASE=$$OUT_PWD + +SERVERRELATIVE="../.." +include(../../serversdk.pri) #serversdk/serversdk.pri) diff --git a/test/unittests/unittests.pro b/test/unittests/unittests.pro index cb6d623..8596bae 100644 --- a/test/unittests/unittests.pro +++ b/test/unittests/unittests.pro @@ -6,4 +6,4 @@ SOURCES += \ HEADERS += \ tst_request.h -include(../../src/serversdk/serversdk.pri) +include(../../serversdk.pri)