diff --git a/cmake/libraries/boost.cmake b/cmake/libraries/boost.cmake index 2be898f..f85b494 100644 --- a/cmake/libraries/boost.cmake +++ b/cmake/libraries/boost.cmake @@ -98,7 +98,7 @@ if(PROJECT_ENABLE_BOOST) set(BOOST_CXX_STANDARD 17) set(BOOST_OPTIONS cxxflags=-Wno-enum-constexpr-conversion) if (PROJECT_IS_DARWIN) - set(BOOST_OPTIONS + set(BOOST_OPTIONS ${BOOST_OPTIONS} define=BOOST_NO_CXX98_FUNCTION_BASE ) @@ -108,12 +108,18 @@ if(PROJECT_ENABLE_BOOST) set(BOOST_OPTIONS define=BOOST_ASIO_HAS_STD_STRING_VIEW) endif() + if (PROJECT_IS_DARWIN) + set(BOOST_CXX_STD_DIALECT iso) + else() + set(BOOST_CXX_STD_DIALECT gnu) + endif() + set(BOOST_BUILD_ARGS --openssldir=$ENV{OPENSSL_ROOT_DIR} --prefix=${PROJECT_EXTERNAL_BUILD_ROOT} address-model=64 architecture=${BOOST_ARCH} - cxxstd-dialect=gnu + cxxstd-dialect=${BOOST_CXX_STD_DIALECT} cxxstd=${BOOST_CXX_STANDARD} define=BOOST_SYSTEM_NO_DEPRECATED link=${BOOST_LINK}