Commit c3d75e66 authored by con's avatar con
Browse files

Fix compilation and rpath with the ssh class move.

parent 0d4ef293
include(utils_dependencies.pri)
LIBS *= -l$$qtLibraryName(Utils)
......@@ -4,8 +4,8 @@ QT += gui \
network
CONFIG += dll
include($$PWD/../../qtcreatorlibrary.pri)
include($$PWD/../3rdparty/botan/botan.pri)
include(../../qtcreatorlibrary.pri)
include(utils_dependencies.pri)
include(utils-lib.pri)
......
include(../3rdparty/botan/botan.pri)
include(../../libs/extensionsystem/extensionsystem.pri)
include(../../libs/utils/utils.pri)
include(../../libs/3rdparty/botan/botan.pri)
......@@ -8,6 +8,8 @@ macx {
} else:linux-* {
#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
QMAKE_RPATHDIR += \$\$ORIGIN
QMAKE_RPATHDIR += \$\$ORIGIN/..
QMAKE_RPATHDIR += \$\$ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment