From: Matthias Maier <tamiko@43-1.org>
Date: Thu, 12 Jan 2017 13:26:27 +0000 (-0600)
Subject: CMake: Define BOOST_NO_CXX11_HDR_UNORDERED_MAP for bundled boost if <gcc-4.8
X-Git-Tag: v8.5.0-rc1~254^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfbde0fb09cefe729805959d25ceaa18c561d0ef;p=dealii.git

CMake: Define BOOST_NO_CXX11_HDR_UNORDERED_MAP for bundled boost if <gcc-4.8

Closes #3624.
---

diff --git a/cmake/configure/configure_boost.cmake b/cmake/configure/configure_boost.cmake
index 1ffbd701a7..45a88e6001 100644
--- a/cmake/configure/configure_boost.cmake
+++ b/cmake/configure/configure_boost.cmake
@@ -47,6 +47,19 @@ MACRO(FEATURE_BOOST_CONFIGURE_BUNDLED)
     LIST(APPEND BOOST_DEFINITIONS "BOOST_ALL_NO_LIB")
     LIST(APPEND BOOST_USER_DEFINITIONS "BOOST_ALL_NO_LIB")
   ENDIF()
+
+  #
+  # Our bundled boost version 1.62 checks for the availability of
+  # "emplace_hint" incorrectly. Thus, simply define
+  # BOOST_NO_CXX11_HDR_UNORDERED_MAP if the gcc compiler version is less
+  # than 4.8.
+  #
+  IF( CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND
+      CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8" )
+    LIST(APPEND BOOST_DEFINITIONS "BOOST_NO_CXX11_HDR_UNORDERED_MAP")
+    LIST(APPEND BOOST_USER_DEFINITIONS "BOOST_NO_CXX11_HDR_UNORDERED_MAP")
+  ENDIF()
+
 ENDMACRO()
 
 MACRO(FEATURE_BOOST_FIND_EXTERNAL var)
@@ -63,6 +76,17 @@ MACRO(FEATURE_BOOST_FIND_EXTERNAL var)
       MESSAGE(STATUS "Boost version 1.58 is not compatible with deal.II!")
       SET(${var} FALSE)
     ENDIF()
+
+    #
+    # Newer boost versions check for the availability of "emplace_hint"
+    # incorrectly. Thus, simply define BOOST_NO_CXX11_HDR_UNORDERED_MAP if
+    # the gcc compiler version is less than 4.8.
+    #
+    IF( CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND
+        CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8" )
+      LIST(APPEND BOOST_DEFINITIONS "BOOST_NO_CXX11_HDR_UNORDERED_MAP")
+      LIST(APPEND BOOST_USER_DEFINITIONS "BOOST_NO_CXX11_HDR_UNORDERED_MAP")
+    ENDIF()
   ENDIF()
 ENDMACRO()