feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Reviewed-By: Oswald Buddenhagen
This commit is contained in:
Daniel Molkentin
2009-09-25 12:28:44 +02:00
parent 06fcf59f2e
commit e7a477b3a0
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/static.pro
View File

@@ -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)

2
src/app/app.pro
View File

@@ -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

13
src/qtcreatorlibrary.pri
View File

@@ -1,7 +1,7 @@
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)
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
} }

2
src/qtcreatorplugin.pri
View File

@@ -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