diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2984e5b..9543446 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,7 @@ build: # name of task tags: # Tags are used to choose correct gitlab-runner - shell # spaceti-runner server has running runners and one has tag 'hw' script: # run in bash + - if [ -d build ];then rm -rf build; fi - mkdir -p build - cd build - qmake ../server-sdk.pro @@ -64,4 +65,4 @@ doc: tags: - shell script: - - scripts/doc.sh clean # 'clean' better clean before generating documentation \ No newline at end of file + - scripts/doc.sh clean # 'clean' better clean before generating documentation diff --git a/serversdk.pri b/serversdk.pri index f0c3402..9cd03d6 100644 --- a/serversdk.pri +++ b/serversdk.pri @@ -18,6 +18,7 @@ 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 diff --git a/src/serversdk/serversdk.pro b/src/serversdk/serversdk.pro index d96b9b1..2bba181 100644 --- a/src/serversdk/serversdk.pro +++ b/src/serversdk/serversdk.pro @@ -25,7 +25,3 @@ HEADERS += \ $$PWD/request.h \ $$PWD/soaprequest.h -# TODO: implement zlib compression -# include (zlib.pri) - -message($$OUT_ROOT)