forked from qt-creator/qt-creator
Fix test compilation on Mac by using rpath.
This commit is contained in:
@@ -3,5 +3,6 @@ INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
|
||||
INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
|
||||
include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)
|
||||
include($$IDE_SOURCE_TREE/src/rpath.pri)
|
||||
|
||||
LIBS += -L$$IDE_PLUGIN_PATH/Nokia
|
||||
DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/Nokia\\\"\"
|
||||
|
||||
@@ -11,13 +11,15 @@ symbian:{
|
||||
RSS_RULES ="group_name=\"QtTests\";"
|
||||
}
|
||||
|
||||
unix:{
|
||||
linux-* {
|
||||
QMAKE_RPATHDIR += $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
|
||||
QMAKE_RPATHDIR += $$IDE_PLUGIN_PATH/Nokia
|
||||
|
||||
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
|
||||
|
||||
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
|
||||
} else:macx {
|
||||
QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/../\"
|
||||
}
|
||||
|
||||
# prefix test binary with tst_
|
||||
|
||||
@@ -11,7 +11,7 @@ QT += gui
|
||||
include(../../../qtcreator.pri)
|
||||
|
||||
# -- Add creator 'utils' lib
|
||||
|
||||
macx:QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/..\"
|
||||
LIBS *= -l$$qtLibraryName(Utils)
|
||||
|
||||
TARGET = process
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
include (../../../qtcreator.pri)
|
||||
include (../../../src/plugins/coreplugin/coreplugin.pri)
|
||||
|
||||
macx:QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/..\"
|
||||
INCLUDEPATH *= $$IDE_SOURCE_TREE/src/plugins
|
||||
LIBS *= -L$$IDE_LIBRARY_PATH/Nokia
|
||||
|
||||
|
||||
Reference in New Issue
Block a user