forked from qt-creator/qt-creator
use IDE_APP_PATH more, introduce IDE_LIBEXEC_PATH
IDE_LIBEXEC_PATH is still the bindir, so it's kinda fake. oh, well.
This commit is contained in:
@@ -38,11 +38,13 @@ sub_dir = $$_PRO_FILE_PWD_
|
||||
sub_dir ~= s,^$$re_escape($$PWD),,
|
||||
IDE_BUILD_TREE = $$cleanPath($$OUT_PWD)
|
||||
IDE_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,,
|
||||
IDE_APP_PATH = $$IDE_BUILD_TREE/bin
|
||||
macx {
|
||||
IDE_APP_TARGET = QtCreator
|
||||
IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/bin/$${IDE_APP_TARGET}.app/Contents/PlugIns
|
||||
IDE_LIBRARY_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/PlugIns
|
||||
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH
|
||||
IDE_DATA_PATH = $$IDE_BUILD_TREE/bin/$${IDE_APP_TARGET}.app/Contents/Resources
|
||||
IDE_LIBEXEC_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
|
||||
IDE_DATA_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
|
||||
contains(QT_CONFIG, ppc):CONFIG += ppc x86
|
||||
} else {
|
||||
win32 {
|
||||
@@ -53,9 +55,9 @@ macx {
|
||||
}
|
||||
IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
|
||||
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins
|
||||
IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
|
||||
IDE_DATA_PATH = $$IDE_BUILD_TREE/share/qtcreator
|
||||
}
|
||||
IDE_APP_PATH = $$IDE_BUILD_TREE/bin
|
||||
|
||||
INCLUDEPATH += \
|
||||
$$IDE_SOURCE_TREE/src/libs \
|
||||
|
@@ -3,7 +3,7 @@ include(../shared/qtsingleapplication/qtsingleapplication.pri)
|
||||
|
||||
TEMPLATE = app
|
||||
TARGET = $$IDE_APP_TARGET
|
||||
DESTDIR = ../../bin
|
||||
DESTDIR = $$IDE_APP_PATH
|
||||
|
||||
|
||||
SOURCES += main.cpp
|
||||
|
@@ -2,11 +2,7 @@ include(../../../qtcreator.pri)
|
||||
|
||||
TEMPLATE = app
|
||||
TARGET = qtcreator_process_stub
|
||||
macx {
|
||||
DESTDIR = $$IDE_BUILD_TREE/bin/$${IDE_APP_TARGET}.app/Contents/Resources
|
||||
} else {
|
||||
DESTDIR = ../../../bin
|
||||
}
|
||||
DESTDIR = $$IDE_LIBEXEC_PATH
|
||||
|
||||
CONFIG += warn_on console use_c_linker
|
||||
CONFIG -= qt app_bundle
|
||||
@@ -23,5 +19,5 @@ unix {
|
||||
LIBS += -lshell32
|
||||
}
|
||||
|
||||
target.path = /bin
|
||||
target.path = /bin # FIXME: libexec, more or less
|
||||
INSTALLS += target
|
||||
|
@@ -1,9 +1,11 @@
|
||||
# This is a compile check for the dumpers only. Don't install the library!
|
||||
|
||||
include(../../qworkbenchlibrary.pri)
|
||||
|
||||
TEMPLATE = lib
|
||||
TARGET = DebuggingHelper
|
||||
CONFIG += shared
|
||||
DESTDIR = ../../../bin
|
||||
DESTDIR = $$IDE_LIBRARY_PATH # /tmp would be better in some respect ...
|
||||
|
||||
linux-* {
|
||||
CONFIG -= release
|
||||
|
Reference in New Issue
Block a user