From: David Wells <drwells@email.unc.edu>
Date: Mon, 25 May 2020 01:13:17 +0000 (-0400)
Subject: Remove some unused CMake code.
X-Git-Tag: v9.3.0-rc1~1563^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0eb473301b39f9694defe60acbffe34268adae96;p=dealii.git

Remove some unused CMake code.

Now that we require C++14 neither of these is necessary.
---

diff --git a/cmake/configure/configure_2_boost.cmake b/cmake/configure/configure_2_boost.cmake
index bb5640bfd8..e2b6e0b619 100644
--- a/cmake/configure/configure_2_boost.cmake
+++ b/cmake/configure/configure_2_boost.cmake
@@ -33,26 +33,6 @@ SET(DEAL_II_WITH_BOOST ON # Always true. We need it :-]
 
 
 MACRO(FEATURE_BOOST_CONFIGURE_COMMON)
-  #
-  # Boost version 1.62 - 1.63 checks for the availability of "emplace_hint"
-  # incorrectly: It tests for the preprocessor define
-  # BOOST_NO_CXX11_HDR_UNORDERED_MAP in .../boost/serialization/map.h
-  # thinking that that this define is characteristic for the presence of
-  # std::(multi)map::emplace_hint. This is generally correct, except for
-  # GCC before 4.8, for which the preprocessor variable is defined, but the
-  # function does not exist [1].
-  #
-  # Thus, simply define a BOOST_NO_CXX11_HDR_UNORDERED_MAP if the gcc
-  # compiler version is less than 4.8.
-  #
-  # [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")
-    LIST(APPEND BOOST_DEFINITIONS "BOOST_NO_CXX11_HDR_UNORDERED_MAP")
-    LIST(APPEND BOOST_USER_DEFINITIONS "BOOST_NO_CXX11_HDR_UNORDERED_MAP")
-  ENDIF()
-
   # Some standard library implementations do not implement std::auto_ptr
   # (anymore) which was deprecated for C++11 and removed in the C++17 standard.
   # Older boost versions can't know about this but provide a possibility to
diff --git a/cmake/configure/configure_2_trilinos.cmake b/cmake/configure/configure_2_trilinos.cmake
index 2bbdcc0f71..eb521c707a 100644
--- a/cmake/configure/configure_2_trilinos.cmake
+++ b/cmake/configure/configure_2_trilinos.cmake
@@ -293,15 +293,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
         NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH
         )
 
-      IF(EXISTS ${SACADO_CONFIG_H})
-        #
-        # Determine whether Trilinos was configured with C++11 support and
-        # enabling C++11 in deal.II is mandatory.
-        #
-        FILE(STRINGS "${SACADO_CONFIG_H}" SACADO_CXX11_STRING
-          REGEX "#define HAVE_SACADO_CXX11")
-      ENDIF()
-
       #
       # GCC 6.3.0 has a bug that prevents the creation of complex
       # numbers templated on Sacado::Rad::ADvar types: