Commit 4a1acffb authored by Oswald Buddenhagen's avatar Oswald Buddenhagen

install the wrapper script into both the builddir and the installdir

parent c30420af
......@@ -3,22 +3,6 @@ IDE_BUILD_TREE = $$OUT_PWD/../../
include(../qworkbench.pri)
include(../shared/qtsingleapplication/qtsingleapplication.pri)
macx {
CONFIG(debug, debug|release):LIBS *= -lExtensionSystem_debug -lAggregation_debug
else:LIBS *= -lExtensionSystem -lAggregation
}
win32 {
CONFIG(debug, debug|release):LIBS *= -lExtensionSystemd -lAggregationd
else:LIBS *= -lExtensionSystem -lAggregation
}
unix:!macx {
LIBS *= -lExtensionSystem -lAggregation
target.path = /bin
INSTALLS += target
}
TEMPLATE = app
TARGET = $$IDE_APP_TARGET
DESTDIR = ../../bin
......@@ -36,5 +20,33 @@ macx {
ICON = qtcreator.icns
}
include(../../share/share.pri)
macx {
CONFIG(debug, debug|release):LIBS *= -lExtensionSystem_debug -lAggregation_debug
else:LIBS *= -lExtensionSystem -lAggregation
}
win32 {
CONFIG(debug, debug|release):LIBS *= -lExtensionSystemd -lAggregationd
else:LIBS *= -lExtensionSystem -lAggregation
}
unix:!macx {
LIBS *= -lExtensionSystem -lAggregation
# make sure the wrapper is in place
!exists($$OUT_PWD/app.pro) {
# we are shadow build
COPYSRC = $$PWD/$$DESTDIR/$$IDE_APP_WRAPPER
COPYDEST = $$OUT_PWD/$$DESTDIR/$$IDE_APP_WRAPPER
win32:COPYSRC ~= s|/+|\|
win32:COPYDEST ~= s|/+|\|
unix:SEPARATOR = ;
win32:SEPARATOR = &
QMAKE_POST_LINK += $${QMAKE_COPY_FILE} $${COPYSRC} $${COPYDEST} $$SEPARATOR
}
target.files += $$OUT_PWD/$$DESTDIR/$$IDE_APP_WRAPPER
target.path = /bin
INSTALLS += target
}
include(../../share/share.pri)
......@@ -26,6 +26,7 @@ macx {
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH
contains(QT_CONFIG, ppc):CONFIG += ppc x86
} else {
IDE_APP_WRAPPER = qtcreator
IDE_APP_TARGET = qtcreator.bin
IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins/
......
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