forked from qt-creator/qt-creator
Build system: make 'install' target work on Windows.
Reviewed-By: Oswald Buddenhagen
This commit is contained in:
@@ -57,7 +57,7 @@ DATA_DIRS = \
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
unix:!macx {
|
!macx {
|
||||||
for(data_dir, DATA_DIRS) {
|
for(data_dir, DATA_DIRS) {
|
||||||
eval($${data_dir}.files = $$quote($$PWD/$$data_dir))
|
eval($${data_dir}.files = $$quote($$PWD/$$data_dir))
|
||||||
eval($${data_dir}.path = /share/qtcreator)
|
eval($${data_dir}.path = /share/qtcreator)
|
||||||
|
@@ -14,6 +14,8 @@ win32 {
|
|||||||
else:LIBS *= -lExtensionSystem -lAggregation
|
else:LIBS *= -lExtensionSystem -lAggregation
|
||||||
|
|
||||||
RC_FILE = qtcreator.rc
|
RC_FILE = qtcreator.rc
|
||||||
|
target.path = /bin
|
||||||
|
INSTALLS += target
|
||||||
} else:macx {
|
} else:macx {
|
||||||
CONFIG(debug, debug|release):LIBS *= -lExtensionSystem_debug -lAggregation_debug
|
CONFIG(debug, debug|release):LIBS *= -lExtensionSystem_debug -lAggregation_debug
|
||||||
else:LIBS *= -lExtensionSystem -lAggregation
|
else:LIBS *= -lExtensionSystem -lAggregation
|
||||||
|
@@ -12,7 +12,12 @@ TARGET = $$qtLibraryTarget($$TARGET)
|
|||||||
|
|
||||||
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
|
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
|
||||||
|
|
||||||
unix:!macx {
|
!macx {
|
||||||
|
win32 {
|
||||||
|
target.path = /bin
|
||||||
|
target.files = $$DESTDIR/$${TARGET}.dll
|
||||||
|
} else {
|
||||||
target.path = /$$IDE_LIBRARY_BASENAME/qtcreator
|
target.path = /$$IDE_LIBRARY_BASENAME/qtcreator
|
||||||
|
}
|
||||||
INSTALLS += target
|
INSTALLS += target
|
||||||
}
|
}
|
||||||
|
@@ -42,7 +42,7 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
|
|||||||
|
|
||||||
CONFIG += plugin plugin_with_soname
|
CONFIG += plugin plugin_with_soname
|
||||||
|
|
||||||
unix:!macx {
|
!macx {
|
||||||
target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
|
target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
|
||||||
pluginspec.files += $${TARGET}.pluginspec
|
pluginspec.files += $${TARGET}.pluginspec
|
||||||
pluginspec.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
|
pluginspec.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
|
||||||
|
Reference in New Issue
Block a user