From 077982254383d76e592ccd7b49619fa412d3b9c1 Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Thu, 16 Apr 2015 13:38:28 +0300 Subject: [PATCH] Clean configuration files --- .travis.yml | 1 - 3rdparty/3rdparty.pri | 4 +++- src/rdm.pro | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1deb48786..9ebacc6a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,6 @@ script: - ./../bin/tests/tests -platform minimal -txt - ./../bin/tests/qml_tests -platform minimal -txt - cd ./../src - - python ./../build/set_version.py 1.0.0 > version.h - sudo chmod a+x configure - ./configure - qmake diff --git a/3rdparty/3rdparty.pri b/3rdparty/3rdparty.pri index 0b618f41d..95cd68d91 100644 --- a/3rdparty/3rdparty.pri +++ b/3rdparty/3rdparty.pri @@ -20,7 +20,6 @@ INCLUDEPATH += $$BREAKPADDIR/src DEPENDPATH += $$PWD/libssh2/include DEPENDPATH += $$BREAKPADDIR -#win32-msvc* { win32* { CONFIG(release, debug|release) { WIN_DEPS_PATH = $$PWD/libs/win32/release/ @@ -81,6 +80,9 @@ unix:!macx { # ubuntu & debian QMAKE_CXXFLAGS += -std=gnu++0x -g #workaround for google breakpad + # clean default flags + QMAKE_LFLAGS_RPATH= + LIBS += -Wl,-rpath=\\\$$ORIGIN/../lib #don't remove!!! LIBS += /usr/local/lib/libssh2.a LIBS += -lcrypto -lz diff --git a/src/rdm.pro b/src/rdm.pro index 80917bdd3..b5f180053 100644 --- a/src/rdm.pro +++ b/src/rdm.pro @@ -12,6 +12,7 @@ TEMPLATE = app # Skip version file !exists( $$PWD/version.h ) { DEFINES += RDM_VERSION=\\\"0.8.0.0\\\" + message("Version: 0.8.0.0") } DEFINES += ELPP_QT_LOGGING ELPP_STL_LOGGING @@ -33,7 +34,6 @@ SOURCES += \ $$PWD/modules/updater/*.cpp \ HEADERS += \ - $$PWD/version.h \ $$PWD/app/dialogs/*.h \ $$PWD/app/models/*.h \ $$PWD/app/models/key-models/*.h \ @@ -95,7 +95,6 @@ unix:!macx { # ubuntu & debian CONFIG += static release CONFIG -= debug - #Qt static linked on Ubuntu/Debian QMAKE_LFLAGS += -static-libgcc -static-libstdc++ release: DESTDIR = ./../bin/linux/release