Fixed lib7zip/libp7zip existing conditions for qmake

This commit is contained in:
Luis Ángel San Martín 2014-06-26 22:20:33 +02:00
parent bff2367caf
commit 2e3f7eb50b
2 changed files with 20 additions and 12 deletions

View File

@ -40,18 +40,22 @@ TRANSLATIONS = yacreader_es.ts \
yacreader_source.ts
win32:!exists (../compressed_archive/lib7zip) {
win32 {
!exists (../compressed_archive/lib7zip) {
error(You\'ll need 7zip source code to compile YACReader. \
Please check the compressed_archive folder for further instructions.)
}
}
unix:exists (../compressed_archive/libp7zip) {
unix {
exists (../compressed_archive/libp7zip) {
message(Found p7zip source code...)
system(patch -d ../compressed_archive -N -p0 -i libp7zip.patch)
} else {
error(You\'ll need 7zip source code to compile YACReader. \
Please check the compressed_archive folder for further instructions.)
}
}
unix:!macx {
#set install prefix if it's empty
@ -91,4 +95,4 @@ desktop.files = ../YACReader.desktop
translation.path = $$DATADIR/YACReader/languages
translation.files = ../release/languages/yacreader_*
}
}

View File

@ -191,17 +191,21 @@ isEqual(QT_MAJOR_VERSION, 5) {
Debug:DESTDIR = ../debug
}
win32:!exists (../compressed_archive/lib7zip) {
error(You\'ll need 7zip source code to compile YACReader. \
Please check the compressed_archive folder for further instructions.)
win32 {
!exists(../compressed_archive/lib7zip){
error(You\'ll need 7zip source code to compile YACReader. \
Please check the compressed_archive folder for further instructions.)
}
}
unix:exists (../compressed_archive/libp7zip) {
message(Found p7zip source code...)
system(patch -d ../compressed_archive -N -p0 -i libp7zip.patch)
unix {
exists (../compressed_archive/libp7zip) {
message(Found p7zip source code...)
system(patch -d ../compressed_archive -N -p0 -i libp7zip.patch)
} else {
error(You\'ll need 7zip source code to compile YACReader. \
Please check the compressed_archive folder for further instructions.)
error(You\'ll need 7zip source code to compile YACReader. \
Please check the compressed_archive folder for further instructions.)
}
}
unix:!macx {
@ -240,4 +244,4 @@ desktop.files = ../YACReaderLibrary.desktop
translation.path = $$DATADIR/YACReader/languages
translation.files = ../release/languages/yacreaderlibrary_*
}
}