From: Matthew Barr Date: Thu, 12 Jan 2017 23:23:00 +0000 (+1100) Subject: Boost 1.61 required for clang/libc++ X-Git-Tag: v4.4.0^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e23316f453d5ccbd5df24e25e75b3d984cb955f2;p=thirdparty%2Fvectorscan.git Boost 1.61 required for clang/libc++ The libc++ headers aren't specific enough and causes the compiler to think there are ambiguous functions when using older Boost versions. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index dee408e3..bc60fe48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,14 @@ include_directories(SYSTEM include) set(BOOST_USE_STATIC_LIBS OFF) set(BOOST_USE_MULTITHREADED OFF) set(BOOST_USE_STATIC_RUNTIME OFF) -set(BOOST_MINVERSION 1.57.0) +if (CMAKE_SYSTEM_NAME MATCHES "Darwin" + OR (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" + AND CMAKE_C_COMPILER_ID MATCHES "Clang")) + # we need a more recent boost for libc++ used by clang on OSX and FreeBSD + set(BOOST_MINVERSION 1.61.0) +else () + set(BOOST_MINVERSION 1.57.0) +endif () set(BOOST_NO_BOOST_CMAKE ON) # first check for Boost installed on the system