aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed the way the setup compiler exe is searched for.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Holger Pandel 2016-06-13 12:37:44 +02:00
parent e13a5d41bb
commit 1d87a046f0
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/valentina/valentina.pro
View File

@ -309,7 +309,7 @@ unix{
} }
# "make install" command for Windows. # "make install" command for Windows.
# Depend on nsis script and create installer in folder "package" # Depend on inno setup script and create installer in folder "package"
win32:*-g++ { win32:*-g++ {
package.path = $${OUT_PWD}/../../../package/valentina package.path = $${OUT_PWD}/../../../package/valentina
package.files += \ package.files += \
@ -435,13 +435,18 @@ 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
contains(QT_ARCH, i386) { SCP_FOUND = false
exists("C:/Program Files (x86)/Inno Setup 5/iscc.exe") {
INNO_ISCC = "C:/Program Files (x86)/Inno Setup 5/iscc.exe" INNO_ISCC = "C:/Program Files (x86)/Inno Setup 5/iscc.exe"
SCP_FOUND = true
} else { } else {
INNO_ISCC = "C:/Program Files/Inno Setup 5/iscc.exe" exists(INNO_ISCC = "C:/Program Files/Inno Setup 5/iscc.exe") {
INNO_ISCC = INNO_ISCC = "C:/Program Files/Inno Setup 5/iscc.exe"
SCP_FOUND = true
}
} }
exists($$INNO_ISCC) { if($$SCP_FOUND) {
package_inno.path = $${OUT_PWD}/../../../package package_inno.path = $${OUT_PWD}/../../../package
package_inno.files += \ package_inno.files += \
$$PWD/../../../dist/win/inno/LICENSE_VALENTINA \ $$PWD/../../../dist/win/inno/LICENSE_VALENTINA \