From 5eddef0f12d6b2869d1e3fdc594f46ccd0bc55d2 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Wed, 19 Aug 2015 15:46:17 +0200 Subject: [PATCH] Add install targets refs #486 --- install.pri | 139 ++++++++++++++++++ mkspecs/features/common_post.prf | 35 ----- mkspecs/features/common_pre.prf | 69 +++++++++ mkspecs/features/config.pri | 1 + resources/swiftresources.pro | 7 + samples/blackmisc/sample_blackmisc.pro | 3 + .../blackmiscdbus/sample_blackmisc_dbus.pro | 3 + .../sample_quantities_aviation.pro | 3 + samples/blackmiscsim/sample_blackmisc_sim.pro | 3 + samples/cli_client/sample_cli_client.pro | 3 + samples/hotkey/sample_hotkey.pro | 3 + src/blackcore/blackcore.pro | 8 + src/blackgui/blackgui.pro | 14 ++ src/blackinput/blackinput.pro | 8 + src/blackmisc/blackmisc.pro | 8 + src/blacksound/blacksound.pro | 13 ++ src/plugins/simulator/fs9/plugin_fs9.pro | 8 + src/plugins/simulator/fsx/plugin_fsx.pro | 8 + .../simulator/xplane/plugin_xplane.pro | 8 + src/swiftcore/swiftcore.pro | 3 + src/swiftdata/swiftdata.pro | 3 + src/swiftguistandard/swiftguistandard.pro | 3 + swift.pro | 2 + 23 files changed, 320 insertions(+), 35 deletions(-) create mode 100644 install.pri diff --git a/install.pri b/install.pri new file mode 100644 index 000000000..687d507e5 --- /dev/null +++ b/install.pri @@ -0,0 +1,139 @@ +CONFIG(debug, debug|release): DLL_DEBUG_SUFFIX = d + +############### Readme, License etc. ##### + +text_files_target.path = $${PREFIX}/bin +text_files_target.files *= README.md +text_files_target.files *= LICENSE + +INSTALLS += text_files_target + +############### Install Qt5 ############## + +win32 { + qt5_target.path = $${PREFIX}/bin +} else { + qt5_target.path = $${PREFIX}/lib +} + +qt5_target.files *= $$[QT_INSTALL_BINS]/Qt5Core$${DLL_DEBUG_SUFFIX}.$${QMAKE_EXTENSION_SHLIB} +qt5_target.files *= $$[QT_INSTALL_BINS]/Qt5Gui$${DLL_DEBUG_SUFFIX}.$${QMAKE_EXTENSION_SHLIB} +qt5_target.files *= $$[QT_INSTALL_BINS]/Qt5Network$${DLL_DEBUG_SUFFIX}.$${QMAKE_EXTENSION_SHLIB} +qt5_target.files *= $$[QT_INSTALL_BINS]/Qt5DBus$${DLL_DEBUG_SUFFIX}.$${QMAKE_EXTENSION_SHLIB} +qt5_target.files *= $$[QT_INSTALL_BINS]/Qt5Xml$${DLL_DEBUG_SUFFIX}.$${QMAKE_EXTENSION_SHLIB} +qt5_target.files *= $$[QT_INSTALL_BINS]/Qt5Multimedia$${DLL_DEBUG_SUFFIX}.$${QMAKE_EXTENSION_SHLIB} +qt5_target.files *= $$[QT_INSTALL_BINS]/Qt5Svg$${DLL_DEBUG_SUFFIX}.$${QMAKE_EXTENSION_SHLIB} +qt5_target.files *= $$[QT_INSTALL_BINS]/Qt5Widgets$${DLL_DEBUG_SUFFIX}.$${QMAKE_EXTENSION_SHLIB} +qt5_target.files *= $$[QT_INSTALL_BINS]/icudt54.$${QMAKE_EXTENSION_SHLIB} +qt5_target.files *= $$[QT_INSTALL_BINS]/icuin54.$${QMAKE_EXTENSION_SHLIB} +qt5_target.files *= $$[QT_INSTALL_BINS]/icuuc54.$${QMAKE_EXTENSION_SHLIB} + +INSTALLS += qt5_target + +############### Install Qt5 platform plugins ############## + +win32 { + QT5_PLATFORM_PLUGINS *= qwindows +} + +qt5_plugin_target.path = $${PREFIX}/bin/platforms + +for (LIBRARY, QT5_PLATFORM_PLUGINS) { + qt5_plugin_target.files *= $$[QT_INSTALL_PLUGINS]/platforms/$${LIBRARY}$${DLL_DEBUG_SUFFIX}.$${QMAKE_EXTENSION_SHLIB} +} + +INSTALLS += qt5_plugin_target + + +############### Install DBus ############## + +dbus_target.path = $${PREFIX}/bin +dbus_target.files *= $$[QT_INSTALL_BINS]/expat.$${QMAKE_EXTENSION_SHLIB} +dbus_target.files *= $$[QT_INSTALL_BINS]/dbus-1.$${QMAKE_EXTENSION_SHLIB} +dbus_target.files *= $$[QT_INSTALL_BINS]/dbus-1-3.$${QMAKE_EXTENSION_SHLIB} +dbus_target.files *= $$[QT_INSTALL_BINS]/dbus-daemon.$${QMAKE_EXTENSION_EXE} + +dbus_config_target.path = $${PREFIX}/share/dbus-1 + +# Order is important here. Newer builds of dbus have the config +# file in share rather and etc has an empty one. In case we have a newer +# build the empty one will be installed first and the full one from +# share overwritten later. +dbus_config_target.files *= $$[QT_INSTALL_BINS]/../etc/dbus-1/* +dbus_config_target.files *= $$[QT_INSTALL_BINS]/../share/dbus-1/* + +INSTALLS += dbus_target dbus_config_target + +############### Install VC runtime ############## + +win32-msvc2013 { + equals(WORD_SIZE,64) { + vc_redist_target.files *= $$(VS120COMNTOOLS)../../VC/redist/1033/vcredist_x64.exe + } + equals(WORD_SIZE,32) { + vc_redist_target.files *= $$(VS120COMNTOOLS)../../VC/redist/1033/vcredist_x86.exe + } + vc_redist_target.path *= $${PREFIX}/vcredist + INSTALLS += vc_redist_target +} + +win32-g++ { + VC_RUNTIME_LIBS *= libgcc_s_dw2-1 + VC_RUNTIME_LIBS *= libwinpthread-1 + + vc_runtime_target.path *= $${PREFIX}/bin + + for (LIBRARY, VC_RUNTIME_LIBS) { + vc_runtime_target.files *= $$[QT_INSTALL_BINS]/$${LIBRARY}.$${QMAKE_EXTENSION_SHLIB} + } + + INSTALLS += vc_runtime_target + + # libstdc++-6.dll needs a workaround since copy does not accept a filepath with '+' in it + vc_runtime_target.depends += copy_libstdc + copy_libstdc.target = copy_libstdc + source_path = $$[QT_INSTALL_BINS]/libstdc++-6.dll + dest_path = $$vc_runtime_target.path + copy_libstdc.commands = xcopy /Y $$shell_path($$source_path) $$shell_path($$dest_path) + QMAKE_EXTRA_TARGETS += copy_libstdc +} + +############### Install externals ############## + +externals_target.path = $${PREFIX}/bin +!win32-g++: externals_target.files *= $${EXTERNALLIBS}/*.$${QMAKE_EXTENSION_SHLIB} +INSTALLS += externals_target + +# win32-g++ needs a workaround since copy does not accept a filepath with '+' in it +# we also need to make it dependent on vc_runtime_target since this target has no +# files and does not generate any install target. +win32-g++ { + vc_runtime_target.depends += copy_externals + copy_externals.target = copy_externals + source_path = $${EXTERNALLIBS}//*.dll + dest_path = $${externals_target.path} + copy_externals.commands += xcopy /Y $$shell_path($$source_path) $$shell_path($$dest_path) $$escape_expand(\n\t) + QMAKE_EXTRA_TARGETS += copy_externals +} + +############### Installbuilder ############## + +bitrock_customize_bin = $$(BITROCK_CUSTOMIZE) +bitrock_builder_bin = $$(BITROCK_BUILDER) +win32:!isEmpty(bitrock_customize_bin):!isEmpty(bitrock_builder_bin) { + + copy_installer_project.depends = install + copy_installer_project.commands = xcopy /Y /E /I $$shell_path($$SourceRoot/installer) $$shell_path($$DestRoot/../../installer) + QMAKE_EXTRA_TARGETS += copy_installer_project + + bitrock_autoupdateproject = "$${PREFIX}/../installer/installbuilder/autoupdateproject.xml" + bitrock_project = $${PREFIX}/../installer/installbuilder/project.xml + + create_updater.depends = copy_installer_project + create_updater.commands = $${bitrock_customize_bin} build $${bitrock_autoupdateproject} windows + QMAKE_EXTRA_TARGETS += create_updater + + create_installer.depends = create_updater + create_installer.commands = $${bitrock_builder_bin} build $${bitrock_project} windows --setvars project.outputDirectory=$${PREFIX}/.. + QMAKE_EXTRA_TARGETS += create_installer +} diff --git a/mkspecs/features/common_post.prf b/mkspecs/features/common_post.prf index 4e6937174..01ecb0d5b 100644 --- a/mkspecs/features/common_post.prf +++ b/mkspecs/features/common_post.prf @@ -15,41 +15,6 @@ macx:staticlib:isEmpty(SOURCES) { QMAKE_MAC_SDK.$$basename(QMAKESPEC).$${QMAKE_MAC_SDK}.QMAKE_RANLIB = $$QMAKE_RANLIB } -################################ -# Externals -################################ - -INCLUDEPATH *= $$EXTERNALDIR/common/include - -# and the library path depending on the used compiler -win32-msvc2013 { - INCLUDEPATH *= $$EXTERNALDIR/win32-vs2013/include - equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/win32-vs2013/lib64 - equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/win32-vs2013/lib32 - equals(WORD_SIZE,32): LIBS += -luser32 -} -win32-msvc2015 { - INCLUDEPATH *= $$EXTERNALDIR/win32-vs2015/include - equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/win32-vs2015/lib64 - equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/win32-vs2015/lib32 - equals(WORD_SIZE,32): LIBS += -luser32 -} -win32-g++ { - INCLUDEPATH *= $$EXTERNALDIR/win32-g++/include - equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/win32-g++/lib64 - equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/win32-g++/lib32 - LIBS += -luser32 -} -linux-g++* { - equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/linux-g++/lib64 - equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/linux-g++/lib32 -} -macx-clang { - INCLUDEPATH *= $$EXTERNALDIR/macx-clang/include - equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/macx-clang/lib64 -F$$EXTERNALDIR/macx-clang/lib64 - equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/macx-clang/lib32 -F$$EXTERNALDIR/macx-clang/lib32 -} - ################################ # Black libs ################################ diff --git a/mkspecs/features/common_pre.prf b/mkspecs/features/common_pre.prf index f5c088522..e63f65373 100644 --- a/mkspecs/features/common_pre.prf +++ b/mkspecs/features/common_pre.prf @@ -110,3 +110,72 @@ isEmpty(EXTERNALDIR) { !exists("$$EXTERNALDIR/common/include") { error("Could not find externals in $$EXTERNALDIR. Please install it!") } + +################################ +# Externals +################################ + +INCLUDEPATH *= $$EXTERNALDIR/common/include + +# and the library path depending on the used compiler +win32-msvc2013 { + INCLUDEPATH *= $$EXTERNALDIR/win32-vs2013/include + equals(WORD_SIZE,64) { + EXTERNALLIBS = $$EXTERNALDIR/win32-vs2013/lib64 + LIBS *= -L$$EXTERNALLIBS + } + equals(WORD_SIZE,32) { + EXTERNALLIBS = $$EXTERNALDIR/win32-vs2013/lib32 + LIBS *= -L$$EXTERNALLIBS + } + equals(WORD_SIZE,32): LIBS += -luser32 +} +win32-g++ { + INCLUDEPATH *= $$EXTERNALDIR/win32-g++/include + equals(WORD_SIZE,64) { + EXTERNALLIBS = $$EXTERNALDIR/win32-g++/lib64 + LIBS *= -L$$EXTERNALLIBS + } + equals(WORD_SIZE,32) { + EXTERNALLIBS = $$EXTERNALDIR/win32-g++/lib32 + LIBS *= -L$$EXTERNALLIBS + } + LIBS += -luser32 +} +linux-g++* { + equals(WORD_SIZE,64) { + EXTERNALLIBS = $$EXTERNALDIR/linux-g++/lib64 + LIBS *= -L$$EXTERNALLIBS + } + equals(WORD_SIZE,32) { + EXTERNALLIBS = $$EXTERNALDIR/linux-g++/lib32 + LIBS *= -L$$EXTERNALLIBS + } +} +macx-clang { + INCLUDEPATH *= $$EXTERNALDIR/macx-clang/include + equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/macx-clang/lib64 -F$$EXTERNALDIR/macx-clang/lib64 + equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/macx-clang/lib32 -F$$EXTERNALDIR/macx-clang/lib32 +} + +################################ +# Platform extensions +################################ + +isEmpty(QMAKE_EXTENSION_SHLIB) { + mac|ios: QMAKE_EXTENSION_SHLIB = dylib + else:win*: QMAKE_EXTENSION_SHLIB = dll + else: QMAKE_EXTENSION_SHLIB = so +} + +isEmpty(QMAKE_EXTENSION_EXE) { + win32: QMAKE_EXTENSION_EXE = exe +} + +################################ +# Install prefix +################################ + +isEmpty(PREFIX) { + PREFIX = $$BuildRoot/dist +} \ No newline at end of file diff --git a/mkspecs/features/config.pri b/mkspecs/features/config.pri index c65ebf9d9..c72278fa7 100644 --- a/mkspecs/features/config.pri +++ b/mkspecs/features/config.pri @@ -12,5 +12,6 @@ BLACK_CONFIG += FS9 BLACK_CONFIG += FSX BLACK_CONFIG += XPlane BLACK_CONFIG += ProfileRelease +BLACK_CONFIG += PackageInstaller #BLACK_CONFIG += Static #BLACK_CONFIG += Doxygen diff --git a/resources/swiftresources.pro b/resources/swiftresources.pro index 582ac63e9..588b855fa 100644 --- a/resources/swiftresources.pro +++ b/resources/swiftresources.pro @@ -22,4 +22,11 @@ COPY_FILES += $$PWD/local.env.template/*.* COPY_FILES += $$PWD/local.env.template/bootstrap/*.* COPY_FILES += $$PWD/local.env.template/bootstrap/0.6/*.* +package_resources.path = $$PREFIX +package_resources.files += data +package_resources.files += swiftDB +package_resources.files += bootstrap +package_resources.files += local.env.template +INSTALLS += package_resources + load(common_post) diff --git a/samples/blackmisc/sample_blackmisc.pro b/samples/blackmisc/sample_blackmisc.pro index 4936ba7cd..cdc485740 100644 --- a/samples/blackmisc/sample_blackmisc.pro +++ b/samples/blackmisc/sample_blackmisc.pro @@ -19,4 +19,7 @@ SOURCES += *.cpp OTHER_FILES += +target.path = $$PREFIX/bin +INSTALLS += target + load(common_post) diff --git a/samples/blackmiscdbus/sample_blackmisc_dbus.pro b/samples/blackmiscdbus/sample_blackmisc_dbus.pro index 6eb850d4d..9587d1918 100644 --- a/samples/blackmiscdbus/sample_blackmisc_dbus.pro +++ b/samples/blackmiscdbus/sample_blackmisc_dbus.pro @@ -19,4 +19,7 @@ SOURCES += *.cpp OTHER_FILES += *.txt *.xml +target.path = $$PREFIX/bin +INSTALLS += target + load(common_post) diff --git a/samples/blackmiscquantities/sample_quantities_aviation.pro b/samples/blackmiscquantities/sample_quantities_aviation.pro index f21f9ad86..6a4b1c99e 100644 --- a/samples/blackmiscquantities/sample_quantities_aviation.pro +++ b/samples/blackmiscquantities/sample_quantities_aviation.pro @@ -17,4 +17,7 @@ DESTDIR = $$DestRoot/bin HEADERS += *.h SOURCES += *.cpp +target.path = $$PREFIX/bin +INSTALLS += target + load(common_post) diff --git a/samples/blackmiscsim/sample_blackmisc_sim.pro b/samples/blackmiscsim/sample_blackmisc_sim.pro index cfded4393..4f745657e 100644 --- a/samples/blackmiscsim/sample_blackmisc_sim.pro +++ b/samples/blackmiscsim/sample_blackmisc_sim.pro @@ -17,4 +17,7 @@ DESTDIR = $$DestRoot/bin HEADERS += *.h SOURCES += *.cpp +target.path = $$PREFIX/bin +INSTALLS += target + load(common_post) diff --git a/samples/cli_client/sample_cli_client.pro b/samples/cli_client/sample_cli_client.pro index 73570b829..cb6d72b35 100644 --- a/samples/cli_client/sample_cli_client.pro +++ b/samples/cli_client/sample_cli_client.pro @@ -17,4 +17,7 @@ HEADERS += *.h DESTDIR = $$DestRoot/bin +target.path = $$PREFIX/bin +INSTALLS += target + load(common_post) diff --git a/samples/hotkey/sample_hotkey.pro b/samples/hotkey/sample_hotkey.pro index 9fe400439..ab459b315 100644 --- a/samples/hotkey/sample_hotkey.pro +++ b/samples/hotkey/sample_hotkey.pro @@ -17,4 +17,7 @@ SOURCES += *.cpp DESTDIR = $$DestRoot/bin +target.path = $$PREFIX/bin +INSTALLS += target + load(common_post) diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro index 78380b89a..eca0d784f 100644 --- a/src/blackcore/blackcore.pro +++ b/src/blackcore/blackcore.pro @@ -37,4 +37,12 @@ DLLDESTDIR = $$DestRoot/bin OTHER_FILES += readme.txt *.xml +win32 { + dlltarget.path = $$PREFIX/bin + INSTALLS += dlltarget +} else { + target.path = $$PREFIX/lib + INSTALLS += target +} + load(common_post) diff --git a/src/blackgui/blackgui.pro b/src/blackgui/blackgui.pro index 754e06dbd..3298a9e1c 100644 --- a/src/blackgui/blackgui.pro +++ b/src/blackgui/blackgui.pro @@ -56,4 +56,18 @@ DLLDESTDIR = $$DestRoot/bin OTHER_FILES += ./qss/*.qss ./qss/*.css ./qss/*.ini *.ico *.rc COPY_FILES += $$PWD/qss/* +win32 { + dlltarget.path = $$PREFIX/bin + INSTALLS += dlltarget +} else { + target.path = $$PREFIX/lib + INSTALLS += target +} + +package_utils.path = $$PREFIX/qss +package_utils.files += qss/*.qss +package_utils.files += qss/*.css +package_utils.files += qss/*.ini +INSTALLS += package_utils + load(common_post) diff --git a/src/blackinput/blackinput.pro b/src/blackinput/blackinput.pro index e71f02b65..5d74e15ac 100644 --- a/src/blackinput/blackinput.pro +++ b/src/blackinput/blackinput.pro @@ -48,4 +48,12 @@ DLLDESTDIR = $$DestRoot/bin OTHER_FILES += RESOURCES += +win32 { + dlltarget.path = $$PREFIX/bin + INSTALLS += dlltarget +} else { + target.path = $$PREFIX/lib + INSTALLS += target +} + load(common_post) diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro index b685ee6de..37aa74995 100644 --- a/src/blackmisc/blackmisc.pro +++ b/src/blackmisc/blackmisc.pro @@ -65,4 +65,12 @@ DLLDESTDIR = $$DestRoot/bin OTHER_FILES += $$TRANSLATIONS readme.txt +win32 { + dlltarget.path = $$PREFIX/bin + INSTALLS += dlltarget +} else { + target.path = $$PREFIX/lib + INSTALLS += target +} + load(common_post) diff --git a/src/blacksound/blacksound.pro b/src/blacksound/blacksound.pro index 6e8b3b444..cd5625e38 100644 --- a/src/blacksound/blacksound.pro +++ b/src/blacksound/blacksound.pro @@ -30,4 +30,17 @@ OTHER_FILES += ./sounds/*.wav sounds/readme.txt COPY_FILES += $$PWD/sounds/* RESOURCES += +win32 { + dlltarget.path = $$PREFIX/bin + INSTALLS += dlltarget +} else { + target.path = $$PREFIX/lib + INSTALLS += target +} + +package_sounds.path = $$PREFIX/sounds +package_sounds.files += sounds/*.wav +package_sounds.files += sounds/readme.txt +INSTALLS += package_sounds + load(common_post) diff --git a/src/plugins/simulator/fs9/plugin_fs9.pro b/src/plugins/simulator/fs9/plugin_fs9.pro index 838461aa4..706a3e0f6 100644 --- a/src/plugins/simulator/fs9/plugin_fs9.pro +++ b/src/plugins/simulator/fs9/plugin_fs9.pro @@ -23,4 +23,12 @@ HEADERS += *.h DESTDIR = $$DestRoot/bin/plugins/simulator +win32 { + dlltarget.path = $$PREFIX/bin/plugins/simulator + INSTALLS += dlltarget +} else { + target.path = $$PREFIX/bin/plugins/simulator + INSTALLS += target +} + load(common_post) diff --git a/src/plugins/simulator/fsx/plugin_fsx.pro b/src/plugins/simulator/fsx/plugin_fsx.pro index 982ea97d7..74d1c9502 100644 --- a/src/plugins/simulator/fsx/plugin_fsx.pro +++ b/src/plugins/simulator/fsx/plugin_fsx.pro @@ -23,4 +23,12 @@ HEADERS += *.h DESTDIR = $$DestRoot/bin/plugins/simulator +win32 { + dlltarget.path = $$PREFIX/bin/plugins/simulator + INSTALLS += dlltarget +} else { + target.path = $$PREFIX/bin/plugins/simulator + INSTALLS += target +} + load(common_post) diff --git a/src/plugins/simulator/xplane/plugin_xplane.pro b/src/plugins/simulator/xplane/plugin_xplane.pro index f86fa246c..b4e2794e7 100644 --- a/src/plugins/simulator/xplane/plugin_xplane.pro +++ b/src/plugins/simulator/xplane/plugin_xplane.pro @@ -16,4 +16,12 @@ HEADERS += *.h DESTDIR = $$DestRoot/bin/plugins/simulator +win32 { + dlltarget.path = $$PREFIX/bin/plugins/simulator + INSTALLS += dlltarget +} else { + target.path = $$PREFIX/bin/plugins/simulator + INSTALLS += target +} + load(common_post) diff --git a/src/swiftcore/swiftcore.pro b/src/swiftcore/swiftcore.pro index 790ea62d7..cdbada86c 100644 --- a/src/swiftcore/swiftcore.pro +++ b/src/swiftcore/swiftcore.pro @@ -25,4 +25,7 @@ DISTFILES += swiftcore.rc DESTDIR = $$DestRoot/bin +target.path = $$PREFIX/bin +INSTALLS += target + load(common_post) diff --git a/src/swiftdata/swiftdata.pro b/src/swiftdata/swiftdata.pro index faf91cce6..9335d1635 100644 --- a/src/swiftdata/swiftdata.pro +++ b/src/swiftdata/swiftdata.pro @@ -26,4 +26,7 @@ DISTFILES += swiftdata.rc DESTDIR = $$DestRoot/bin +target.path = $$PREFIX/bin +INSTALLS += target + load(common_post) diff --git a/src/swiftguistandard/swiftguistandard.pro b/src/swiftguistandard/swiftguistandard.pro index 3aa8a5709..9461cbfd2 100644 --- a/src/swiftguistandard/swiftguistandard.pro +++ b/src/swiftguistandard/swiftguistandard.pro @@ -34,4 +34,7 @@ DISTFILES += swift.rc DESTDIR = $$DestRoot/bin +target.path = $$PREFIX/bin +INSTALLS += target + load(common_post) diff --git a/swift.pro b/swift.pro index 956b61882..1f308b08e 100644 --- a/swift.pro +++ b/swift.pro @@ -71,3 +71,5 @@ contains(BLACK_CONFIG, Unittests) { contains(BLACK_CONFIG, Doxygen) { SUBDIRS += docs/doxygen.pro } + +include(install.pri)