d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Attempt to fix compatibility with libboost v1.34

adaptive-webui-19844
Christophe Dumez 15 years ago
parent
37650d8156
commit
e4399412b6
2 changed files with 12 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      configure
  2. 7
      qcm/libboost.qcm

7
configure vendored
Unescape View File

@ -388,6 +388,7 @@ arg: with-libboost-inc=[path], Path to libboost include files
arg: with-libboost-lib=[path], Path to libboost library files arg: with-libboost-lib=[path], Path to libboost library files
-----END QCMOD----- -----END QCMOD-----
*/ */
#include <boost/version.hpp>
class qc_libboost : public ConfObj class qc_libboost : public ConfObj
{ {
public: public:
@ -451,7 +452,11 @@ public:
// Find library // Find library
s = conf->getenv("QC_WITH_LIBBOOST_LIB"); s = conf->getenv("QC_WITH_LIBBOOST_LIB");
QStringList required_libs; QStringList required_libs;
required_libs << "system" << "filesystem" << "thread"; required_libs
#if BOOST_VERSION >= 103500
<< "system"
#endif
<< "filesystem" << "thread";
QStringList libDirs; QStringList libDirs;
libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/"; libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
foreach(const QString& lib, required_libs) { foreach(const QString& lib, required_libs) {

7
qcm/libboost.qcm
Unescape View File

@ -5,6 +5,7 @@ arg: with-libboost-inc=[path], Path to libboost include files
arg: with-libboost-lib=[path], Path to libboost library files arg: with-libboost-lib=[path], Path to libboost library files
-----END QCMOD----- -----END QCMOD-----
*/ */
#include <boost/version.hpp>
class qc_libboost : public ConfObj class qc_libboost : public ConfObj
{ {
public: public:
@ -68,7 +69,11 @@ public:
// Find library // Find library
s = conf->getenv("QC_WITH_LIBBOOST_LIB"); s = conf->getenv("QC_WITH_LIBBOOST_LIB");
QStringList required_libs; QStringList required_libs;
required_libs << "system" << "filesystem" << "thread"; required_libs
#if BOOST_VERSION >= 103500
<< "system"
#endif
<< "filesystem" << "thread";
QStringList libDirs; QStringList libDirs;
libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/"; libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
foreach(const QString& lib, required_libs) { foreach(const QString& lib, required_libs) {

Write Preview
Loading…
Cancel
Save