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,26 +2002,32 @@ 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
package_nsis.path = $${OUT_PWD}/../../../package NSIS_MAKENSISW = "C:/Program Files/NSIS/makensisw.exe"
package_nsis.files += \
$$PWD/../../../dist/win/nsis/valentina.nsi \
$$PWD/../../../dist/win/nsis/unList.exe # copy exe instead of creating from nsi
INSTALLS += package_nsis
package_nsis_headers.path = $${OUT_PWD}/../../../package/headers exists($$NSIS_MAKENSISW) {
package_nsis_headers.files += \ package_nsis.path = $${OUT_PWD}/../../../package
$$PWD/../../../dist/win/nsis/headers/fileassoc.nsh \ package_nsis.files += \
$$PWD/../../../dist/win/nsis/headers/fileversion.nsh $$PWD/../../../dist/win/nsis/valentina.nsi \
INSTALLS += package_nsis_headers $$PWD/../../../dist/win/nsis/unList.exe # copy exe instead of creating from nsi
INSTALLS += package_nsis
# Do the packaging package_nsis_headers.path = $${OUT_PWD}/../../../package/headers
# First, mangle all of INSTALLS values. We depend on them. package_nsis_headers.files += \
unset(MANGLED_INSTALLS) $$PWD/../../../dist/win/nsis/headers/fileassoc.nsh \
for(x, INSTALLS):MANGLED_INSTALLS += install_$${x} $$PWD/../../../dist/win/nsis/headers/fileversion.nsh
build_package.path = $${OUT_PWD}/../../../package INSTALLS += package_nsis_headers
build_package.commands = \"C:/Program Files/NSIS/makensisw.exe\" \"$${OUT_PWD}/../../../package/valentina.nsi\"
build_package.depends = $${MANGLED_INSTALLS} # Do the packaging
INSTALLS += build_package # First, mangle all of INSTALLS values. We depend on them.
unset(MANGLED_INSTALLS)
for(x, INSTALLS):MANGLED_INSTALLS += install_$${x}
build_package.path = $${OUT_PWD}/../../../package
build_package.commands = $$NSIS_MAKENSISW \"$${OUT_PWD}/../../../package/valentina.nsi\"
build_package.depends = $${MANGLED_INSTALLS}
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.