github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-19 12:59:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Use pkgconfig for GNU common c++

Browse source
This commit is contained in:
Christophe Dumez 2007-07-23 09:48:51 +00:00
commit c8c53e2812
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
configure vendored
View file

@ -427,7 +427,7 @@ public:
QString s; QString s;
s = conf->getenv("QC_WITH_LIBCOMMONCPP2_INC"); s = conf->getenv("QC_WITH_LIBCOMMONCPP2_INC");
if(!s.isEmpty()) { if(!s.isEmpty()) {
if(!conf->checkHeader(s, "cc++/common.h")) { if(!conf->checkHeader(s, "cc++/url.h")) {
return false; return false;
} }
}else{ }else{
@ -436,7 +436,7 @@ public:
sl << "/usr/local/include"; sl << "/usr/local/include";
bool found = false; bool found = false;
foreach(s, sl){ foreach(s, sl){
if(conf->checkHeader(s, "cc++/common.h")){ if(conf->checkHeader(s, "cc++/url.h")){
found = true; found = true;
break; break;
} }
@ -470,7 +470,7 @@ public:
if(!found) return false; if(!found) return false;
conf->addLib(QString("-L") + s); conf->addLib(QString("-L") + s);
} }
conf->addLib("-lccext2 -lccgnu2"); //conf->addLib("-lccext2 -lccgnu2");
return true; return true;
} }
}; };

6
qcm/libcommoncpp2.qcm
View file

@ -15,7 +15,7 @@ public:
QString s; QString s;
s = conf->getenv("QC_WITH_LIBCOMMONCPP2_INC"); s = conf->getenv("QC_WITH_LIBCOMMONCPP2_INC");
if(!s.isEmpty()) { if(!s.isEmpty()) {
if(!conf->checkHeader(s, "cc++/common.h")) { if(!conf->checkHeader(s, "cc++/url.h")) {
return false; return false;
} }
}else{ }else{
@ -24,7 +24,7 @@ public:
sl << "/usr/local/include"; sl << "/usr/local/include";
bool found = false; bool found = false;
foreach(s, sl){ foreach(s, sl){
if(conf->checkHeader(s, "cc++/common.h")){ if(conf->checkHeader(s, "cc++/url.h")){
found = true; found = true;
break; break;
} }
@ -58,7 +58,7 @@ public:
if(!found) return false; if(!found) return false;
conf->addLib(QString("-L") + s); conf->addLib(QString("-L") + s);
} }
conf->addLib("-lccext2 -lccgnu2"); //conf->addLib("-lccext2 -lccgnu2");
return true; return true;
} }
}; };

2
src/src.pro
View file

@ -29,7 +29,7 @@ QMAKE_CXXFLAGS_RELEASE += -fwrapv
QMAKE_CXXFLAGS_DEBUG += -fwrapv QMAKE_CXXFLAGS_DEBUG += -fwrapv
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
PKGCONFIG += libtorrent PKGCONFIG += libtorrent libccext2 libccgnu2
QT += network xml QT += network xml
DEFINES += QT_NO_CAST_TO_ASCII DEFINES += QT_NO_CAST_TO_ASCII