Skip part about NSIS if was not installed.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-10-22 17:50:42 +03:00
parent d0f714f707
commit bcbb7e66d2

View File

@ -2002,6 +2002,9 @@ win32:*-g++ {
package_printsupport.files += $$[QT_INSTALL_PLUGINS]/printsupport/windowsprintersupport.dll package_printsupport.files += $$[QT_INSTALL_PLUGINS]/printsupport/windowsprintersupport.dll
INSTALLS += package_printsupport INSTALLS += package_printsupport
NSIS_MAKENSISW = "C:/Program Files/NSIS/makensisw.exe"
exists($$NSIS_MAKENSISW) {
package_nsis.path = $${OUT_PWD}/../../../package package_nsis.path = $${OUT_PWD}/../../../package
package_nsis.files += \ package_nsis.files += \
$$PWD/../../../dist/win/nsis/valentina.nsi \ $$PWD/../../../dist/win/nsis/valentina.nsi \
@ -2019,9 +2022,12 @@ win32:*-g++ {
unset(MANGLED_INSTALLS) unset(MANGLED_INSTALLS)
for(x, INSTALLS):MANGLED_INSTALLS += install_$${x} for(x, INSTALLS):MANGLED_INSTALLS += install_$${x}
build_package.path = $${OUT_PWD}/../../../package build_package.path = $${OUT_PWD}/../../../package
build_package.commands = \"C:/Program Files/NSIS/makensisw.exe\" \"$${OUT_PWD}/../../../package/valentina.nsi\" build_package.commands = $$NSIS_MAKENSISW \"$${OUT_PWD}/../../../package/valentina.nsi\"
build_package.depends = $${MANGLED_INSTALLS} build_package.depends = $${MANGLED_INSTALLS}
INSTALLS += build_package INSTALLS += build_package
} else {
message("NSIS was not found!")
}
} }
# Some systems use special name for lrelease. For example opensuse 13.2 has lrelease-qt5. # Some systems use special name for lrelease. For example opensuse 13.2 has lrelease-qt5.