github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-14 18:47:37 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Improved ImageMagick detection and it should be able to build without it too now

Browse source
This commit is contained in:
Christophe Dumez 2007-08-29 10:20:39 +00:00
commit 2ddcaf008b
5 changed files with 150 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

26
qcm/libmagick.qcm
View file

@ -11,13 +11,20 @@ public:
qc_libmagick(Conf *c) : ConfObj(c) {}
QString name() const { return "ImageMagick library (libmagick++)"; }
QString shortname() const { return "libmagick++"; }
QString checkString() const {
if(!conf->getenv("QC_DISABLE_libmagick").isEmpty())
return "";
return ConfObj::checkString();
}
bool exec(){
QString s;
if(!conf->getenv("QC_DISABLE_libmagick").isEmpty())
return false;
QString s;
s = conf->getenv("QC_WITH_LIBMAGICK_INC");
if(!s.isEmpty()) {
if(!conf->checkHeader(s, "Magick++.h")) {
return false;
}
}
}else{
QStringList sl;
sl << "/usr/include";
@ -29,17 +36,17 @@ public:
break;
}
}
if(!found) {
if(!found)
return false;
}
}
conf->addIncludePath(s);
s = conf->getenv("QC_WITH_LIBMAGICK_LIB");
if(!s.isEmpty()) {
if(!QFile::exists(s+QString("libMagick++.so")))
return false;
conf->addLib(QString("-L") + s);
if(!QFile::exists(s+QString("libMagick++.so"))){
return false;
}
conf->addLib(QString("-L") + s);
}else{
QStringList sl;
sl << "/usr/lib/";
@ -48,11 +55,14 @@ public:
foreach(s, sl){
if(QFile::exists(s+QString("libMagick++.so"))){
found = true;
break;
}
}
if(!found) return false;
if(!found)
return false;
conf->addLib(QString("-L") + s);
}
conf->addDefine("HAVE_MAGICK");
return true;
}
};