From f8a5c85a76c3cb3987b7daa9ce7be1fae5dedf2a Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Thu, 2 Feb 2017 13:06:32 -0500 Subject: [PATCH] Fix BOOST_NO_CXX11_HDR_UNORDERED_MAP warning When forcing CXX11 to off, I get the following warning with gcc <4.8: ``` /ssd/deal-git/bundled/boost-1.62.0/include/boost/config/stdlib/libstdcpp3.hpp:182:0: warning: "BOOST_NO_CXX11_HDR_UNORDERED_MAP" redefined ``` This change fixes this. --- cmake/configure/configure_boost.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/configure/configure_boost.cmake b/cmake/configure/configure_boost.cmake index c96ae66c55..7c8adafb0d 100644 --- a/cmake/configure/configure_boost.cmake +++ b/cmake/configure/configure_boost.cmake @@ -38,7 +38,8 @@ MACRO(FEATURE_BOOST_CONFIGURE_COMMON) # [1] https://svn.boost.org/trac/boost/ticket/12755 # IF( CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND - CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8" ) + CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8" AND + DEAL_II_WITH_CXX11) LIST(APPEND BOOST_DEFINITIONS "BOOST_NO_CXX11_HDR_UNORDERED_MAP") LIST(APPEND BOOST_USER_DEFINITIONS "BOOST_NO_CXX11_HDR_UNORDERED_MAP") ENDIF() -- 2.39.5