From 7f58460e5fb16906b4dd39bce8d94d5093e76ee2 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 12 Jan 2015 23:14:35 +0000 Subject: [PATCH] Added DEPENDPATH to pro files git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7842 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libbitdht/src/libbitdht.pro | 4 ++-- libretroshare/src/libretroshare.pro | 4 ++++ openpgpsdk/src/openpgpsdk.pro | 1 + plugins/Common/retroshare_plugin.pri | 1 + plugins/FeedReader/FeedReader.pro | 1 + plugins/VOIP/VOIP.pro | 1 + retroshare-gui/src/retroshare-gui.pro | 21 ++++++--------------- retroshare-nogui/src/retroshare-nogui.pro | 10 +++++++--- 8 files changed, 23 insertions(+), 20 deletions(-) diff --git a/libbitdht/src/libbitdht.pro b/libbitdht/src/libbitdht.pro index 44e6ba674..6f705fa7d 100644 --- a/libbitdht/src/libbitdht.pro +++ b/libbitdht/src/libbitdht.pro @@ -102,8 +102,8 @@ openbsd-* { ################################### COMMON stuff ################################## ################################### COMMON stuff ################################## -#DEPENDPATH += . \ -INCLUDEPATH += . \ +DEPENDPATH += . +INCLUDEPATH += . HEADERS += \ bitdht/bdiface.h \ diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index 5046158f2..3964860bf 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -76,6 +76,7 @@ SOURCES += tcponudp/udppeer.cc \ BITDHT_DIR = ../../libbitdht/src + DEPENDPATH += . $${BITDHT_DIR} INCLUDEPATH += . $${BITDHT_DIR} # The next line is for compliance with debian packages. Keep it! INCLUDEPATH += ../libbitdht @@ -125,6 +126,7 @@ linux-* { INCLUDEPATH += $$system(pkg-config --cflags glib-2.0 | sed -e "s/-I//g") OPENPGPSDK_DIR = ../../openpgpsdk/src + DEPENDPATH *= $${OPENPGPSDK_DIR} ../openpgpsdk INCLUDEPATH *= $${OPENPGPSDK_DIR} ../openpgpsdk DESTDIR = lib @@ -133,6 +135,7 @@ linux-* { SSL_DIR = /usr/include/openssl UPNP_DIR = /usr/include/upnp + DEPENDPATH += . $${SSL_DIR} $${UPNP_DIR} INCLUDEPATH += . $${SSL_DIR} $${UPNP_DIR} # where to put the shared library itself @@ -232,6 +235,7 @@ win32 { LIBS_DIR = $$PWD/../../../libs OPENPGPSDK_DIR = $$PWD/../../openpgpsdk/src + DEPENDPATH += . $$LIBS_DIR/include $$LIBS_DIR/include/miniupnpc $$OPENPGPSDK_DIR INCLUDEPATH += . $$LIBS_DIR/include $$LIBS_DIR/include/miniupnpc $$OPENPGPSDK_DIR } diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro index 0ed1cd07b..dced8d172 100644 --- a/openpgpsdk/src/openpgpsdk.pro +++ b/openpgpsdk/src/openpgpsdk.pro @@ -35,6 +35,7 @@ win32 { LIBS_DIR = $$PWD/../../../libs + DEPENDPATH += $$LIBS_DIR/include INCLUDEPATH += $$LIBS_DIR/include } diff --git a/plugins/Common/retroshare_plugin.pri b/plugins/Common/retroshare_plugin.pri index a47849b84..3165b14cf 100644 --- a/plugins/Common/retroshare_plugin.pri +++ b/plugins/Common/retroshare_plugin.pri @@ -1,5 +1,6 @@ TEMPLATE = lib +DEPENDPATH += ../../libretroshare/src/ ../../retroshare-gui/src/ INCLUDEPATH += ../../libretroshare/src/ ../../retroshare-gui/src/ linux-g++ { diff --git a/plugins/FeedReader/FeedReader.pro b/plugins/FeedReader/FeedReader.pro index daeb114c9..67a00e904 100644 --- a/plugins/FeedReader/FeedReader.pro +++ b/plugins/FeedReader/FeedReader.pro @@ -82,6 +82,7 @@ TRANSLATIONS += \ linux-* { LIBXML2_DIR = /usr/include/libxml2 + DEPENDPATH += $${LIBXML2_DIR} INCLUDEPATH += $${LIBXML2_DIR} LIBS += -lcurl -lxml2 -lxslt diff --git a/plugins/VOIP/VOIP.pro b/plugins/VOIP/VOIP.pro index 1ed8b9d27..ded395aaa 100644 --- a/plugins/VOIP/VOIP.pro +++ b/plugins/VOIP/VOIP.pro @@ -13,6 +13,7 @@ exists($$[QMAKE_MKSPECS]/features/mobility.prf) { CONFIG += qt uic qrc resources MOBILITY = multimedia +DEPENDPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src INCLUDEPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src #################################### Windows ##################################### diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 1cc430ed1..d9e93e609 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -56,6 +56,7 @@ debug { QMAKE_CFLAGS += -O0 } +DEPENDPATH *= retroshare-gui INCLUDEPATH *= retroshare-gui # treat warnings as error for better removing @@ -88,7 +89,9 @@ linux-* { } LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a + DEPENDPATH += ../../../lib/sqlcipher/src/ INCLUDEPATH += ../../../lib/sqlcipher/src/ + DEPENDPATH += ../../../lib/sqlcipher/tsrc/ INCLUDEPATH += ../../../lib/sqlcipher/tsrc/ } else { @@ -199,6 +202,7 @@ win32 { DEFINES *= WINDOWS_SYS WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T + DEPENDPATH += . INCLUDEPATH += . } @@ -284,21 +288,7 @@ win32 { LIBS += -lws2_32 } -DEPENDPATH += . \ - rsiface \ - control \ - gui \ - lang \ - util \ - gui/bwgraph \ - gui/chat \ - gui/connect \ - gui/images \ - gui/common \ - gui/toaster \ - gui/help/browser \ - gui/elastic - +DEPENDPATH += . ../../libretroshare/src/ INCLUDEPATH += ../../libretroshare/src/ # Input @@ -1082,6 +1072,7 @@ gxsphotoshare { wikipoos { + DEPENDPATH += ../../supportlibs/pegmarkdown INCLUDEPATH += ../../supportlibs/pegmarkdown HEADERS += gui/WikiPoos/WikiDialog.h \ diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro index 8d5ff65b0..6e68cb8a0 100644 --- a/retroshare-nogui/src/retroshare-nogui.pro +++ b/retroshare-nogui/src/retroshare-nogui.pro @@ -42,6 +42,7 @@ linux-* { } LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a + DEPENDPATH += ../../../lib/sqlcipher/src/ INCLUDEPATH += ../../../lib/sqlcipher/src/ } else { LIBS += -lsqlcipher @@ -105,7 +106,8 @@ win32 { DEFINES *= WINDOWS_SYS _USE_32BIT_TIME_T - INCLUDEPATH += . $$LIBS_DIR/include + DEPENDPATH += $$LIBS_DIR/include + INCLUDEPATH += $$LIBS_DIR/include gxs { LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a @@ -178,8 +180,7 @@ bitdht { LIBS += ../../libbitdht/src/lib/libbitdht.a } -DEPENDPATH += ../../libretroshare/src - +DEPENDPATH += . ../../libretroshare/src INCLUDEPATH += . ../../libretroshare/src # Input @@ -220,6 +221,7 @@ sshserver { DEFINES *= LIBSSH_STATIC } + DEPENDPATH += $$LIBSSH_DIR/include/ INCLUDEPATH += $$LIBSSH_DIR/include/ win32 { @@ -342,6 +344,7 @@ protorpc { # ../../rsctrl/src/gencc/files.pb.cc \ # ../../rsctrl/src/gencc/stream.pb.cc \ + DEPENDPATH *= rpc/proto/gencc INCLUDEPATH *= rpc/proto/gencc !win32 { @@ -352,6 +355,7 @@ protorpc { LIBS += -lprotobuf -lpthread win32 { + DEPENDPATH += $$LIBS_DIR/include/protobuf INCLUDEPATH += $$LIBS_DIR/include/protobuf }