feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix compilation and rpath with the ssh class move.

Browse Source
This commit is contained in:
con
2011-02-17 15:43:21 +01:00
parent 0d4ef2939f
commit c3d75e66d1
5 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/utils/utils.pri
View File

@@ -1 +1,2 @@
include(utils_dependencies.pri)
LIBS *= -l$$qtLibraryName(Utils) LIBS *= -l$$qtLibraryName(Utils)

4
src/libs/utils/utils.pro
View File

@@ -4,8 +4,8 @@ QT += gui \
network network
CONFIG += dll CONFIG += dll
include($$PWD/../../qtcreatorlibrary.pri) include(../../qtcreatorlibrary.pri)
include($$PWD/../3rdparty/botan/botan.pri) include(utils_dependencies.pri)
include(utils-lib.pri) include(utils-lib.pri)

1
src/libs/utils/utils_dependencies.pri Normal file
View File

@@ -0,0 +1 @@
include(../3rdparty/botan/botan.pri)

1
src/plugins/coreplugin/coreplugin_dependencies.pri
View File

@@ -1,3 +1,2 @@
include(../../libs/extensionsystem/extensionsystem.pri) include(../../libs/extensionsystem/extensionsystem.pri)
include(../../libs/utils/utils.pri) include(../../libs/utils/utils.pri)
include(../../libs/3rdparty/botan/botan.pri)

2
src/rpath.pri
View File

@@ -8,6 +8,8 @@ macx {
} else:linux-* { } else:linux-* {
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
# this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
QMAKE_RPATHDIR += \$\$ORIGIN
QMAKE_RPATHDIR += \$\$ORIGIN/..
QMAKE_RPATHDIR += \$\$ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator QMAKE_RPATHDIR += \$\$ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")