Skip to content
Snippets Groups Projects
Commit e7a477b3 authored by Daniel Molkentin's avatar Daniel Molkentin
Browse files

Build system: make 'install' target work on Windows.

Reviewed-By: Oswald Buddenhagen
parent 06fcf59f
No related branches found
No related tags found
No related merge requests found
...@@ -57,7 +57,7 @@ DATA_DIRS = \ ...@@ -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 { ...@@ -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
......
include(../qtcreator.pri) include(../qtcreator.pri)
win32 { win32 {
DLLDESTDIR = $$IDE_APP_PATH DLLDESTDIR = $$IDE_APP_PATH
} }
DESTDIR = $$IDE_LIBRARY_PATH DESTDIR = $$IDE_LIBRARY_PATH
...@@ -12,7 +12,12 @@ TARGET = $$qtLibraryTarget($$TARGET) ...@@ -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 {
target.path = /$$IDE_LIBRARY_BASENAME/qtcreator win32 {
INSTALLS += target target.path = /bin
target.files = $$DESTDIR/$${TARGET}.dll
} else {
target.path = /$$IDE_LIBRARY_BASENAME/qtcreator
}
INSTALLS += target
} }
...@@ -42,7 +42,7 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols ...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment