diff --git a/src/libs/utils/utils.pri b/src/libs/utils/utils.pri index f6e523b74d763e2bcfc534a3d0dc6d6aed24714a..414ef2bd868f36a531908c9aa76860f49c47f7ac 100644 --- a/src/libs/utils/utils.pri +++ b/src/libs/utils/utils.pri @@ -1 +1,2 @@ +include(utils_dependencies.pri) LIBS *= -l$$qtLibraryName(Utils) diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro index dbf97987c288c52bcc28cd926f42fbebdabe9bb7..29e910f335c7a79733e5a5fe24c684ee72aa11a4 100644 --- a/src/libs/utils/utils.pro +++ b/src/libs/utils/utils.pro @@ -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) diff --git a/src/libs/utils/utils_dependencies.pri b/src/libs/utils/utils_dependencies.pri new file mode 100644 index 0000000000000000000000000000000000000000..e2a3c96f45793ed67ad0e3c7dcf0181be9c72b01 --- /dev/null +++ b/src/libs/utils/utils_dependencies.pri @@ -0,0 +1 @@ +include(../3rdparty/botan/botan.pri) diff --git a/src/plugins/coreplugin/coreplugin_dependencies.pri b/src/plugins/coreplugin/coreplugin_dependencies.pri index e908601b226174d88daa6a76a1ccef7604ca1ea5..8b548e7179652be5353d07e47e964551305602df 100644 --- a/src/plugins/coreplugin/coreplugin_dependencies.pri +++ b/src/plugins/coreplugin/coreplugin_dependencies.pri @@ -1,3 +1,2 @@ include(../../libs/extensionsystem/extensionsystem.pri) include(../../libs/utils/utils.pri) -include(../../libs/3rdparty/botan/botan.pri) diff --git a/src/rpath.pri b/src/rpath.pri index c0882c411547c3b752daa6a0edf60896245e6dac..a3dff7a9df7da06555d01ebe7fd85db3efc3f41d 100644 --- a/src/rpath.pri +++ b/src/rpath.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, ":")