Merged luisangelsm/yacreader into default

This commit is contained in:
Felix Kauselmann 2014-06-27 20:21:33 +02:00
commit c35df6757f
2 changed files with 20 additions and 12 deletions

View File

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

View File

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