Browse Source

Attempt to fix compatibility with libboost v1.34

adaptive-webui-19844
Christophe Dumez 15 years ago
parent
commit
e4399412b6
  1. 7
      configure
  2. 7
      qcm/libboost.qcm

7
configure vendored

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

7
qcm/libboost.qcm

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

Loading…
Cancel
Save