From 4ce8c8a1f6e4817a0595cfc414837e3bb3998a3f Mon Sep 17 00:00:00 2001
From: Matthias Maier <tamiko@43-1.org>
Date: Tue, 1 Sep 2020 14:45:26 -0500
Subject: [PATCH] CMake: Remove DEAL_II_CXX_VERSION_FLAG

This variable is no longer populated. Remove all occurences.
---
 cmake/configure/configure_1_cuda.cmake     | 5 -----
 cmake/configure/configure_2_boost.cmake    | 2 --
 cmake/configure/configure_2_trilinos.cmake | 3 ---
 cmake/configure/configure_adolc.cmake      | 1 -
 doc/users/cmake_dealii.html                | 9 ---------
 5 files changed, 20 deletions(-)

diff --git a/cmake/configure/configure_1_cuda.cmake b/cmake/configure/configure_1_cuda.cmake
index 3dcff92305..dffca252dc 100644
--- a/cmake/configure/configure_1_cuda.cmake
+++ b/cmake/configure/configure_1_cuda.cmake
@@ -173,11 +173,6 @@ MACRO(FEATURE_CUDA_CONFIGURE_EXTERNAL)
   SET(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_LIBRARIES 0)
   SET(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_OBJECTS 0)
 
-  #
-  # Set up cuda flags:
-  #
-  ADD_FLAGS(DEAL_II_CUDA_FLAGS "${DEAL_II_CXX_VERSION_FLAG}")
-
   # We cannot use -pedantic as compiler flags. nvcc generates code that
   # produces a lot of warnings when pedantic is enabled. So filter out the
   # flag:
diff --git a/cmake/configure/configure_2_boost.cmake b/cmake/configure/configure_2_boost.cmake
index e2b6e0b619..24463063bc 100644
--- a/cmake/configure/configure_2_boost.cmake
+++ b/cmake/configure/configure_2_boost.cmake
@@ -37,7 +37,6 @@ MACRO(FEATURE_BOOST_CONFIGURE_COMMON)
   # (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
   # circumvent the issue. Hence, we just check ourselves.
-  ADD_FLAGS(CMAKE_REQUIRED_FLAGS "${DEAL_II_CXX_VERSION_FLAG}")
   IF(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     ADD_FLAGS(CMAKE_REQUIRED_FLAGS "/WX /EHsc")
   ELSE()
@@ -118,7 +117,6 @@ MACRO(FEATURE_BOOST_FIND_EXTERNAL var)
       # Test that Boost.Iostreams is usable.
       #
       RESET_CMAKE_REQUIRED()
-      ADD_FLAGS(CMAKE_REQUIRED_FLAGS "${DEAL_II_CXX_VERSION_FLAG}")
       LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${BOOST_LIBRARIES})
       LIST(APPEND CMAKE_REQUIRED_INCLUDES ${BOOST_INCLUDE_DIRS})
 
diff --git a/cmake/configure/configure_2_trilinos.cmake b/cmake/configure/configure_2_trilinos.cmake
index eb521c707a..fc65b84a10 100644
--- a/cmake/configure/configure_2_trilinos.cmake
+++ b/cmake/configure/configure_2_trilinos.cmake
@@ -203,7 +203,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
       #
       LIST(APPEND CMAKE_REQUIRED_INCLUDES ${Trilinos_INCLUDE_DIRS})
       LIST(APPEND CMAKE_REQUIRED_INCLUDES ${MPI_CXX_INCLUDE_PATH})
-      ADD_FLAGS(CMAKE_REQUIRED_FLAGS "${DEAL_II_CXX_VERSION_FLAG}")
 
       CHECK_SYMBOL_EXISTS(
         "KOKKOS_ENABLE_CUDA_LAMBDA"
@@ -252,7 +251,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
       #
       LIST(APPEND CMAKE_REQUIRED_INCLUDES ${Trilinos_INCLUDE_DIRS})
       LIST(APPEND CMAKE_REQUIRED_INCLUDES ${MPI_CXX_INCLUDE_PATH})
-      ADD_FLAGS(CMAKE_REQUIRED_FLAGS "${DEAL_II_CXX_VERSION_FLAG}")
 
       LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${Trilinos_LIBRARIES} ${MPI_LIBRARIES})
 
@@ -311,7 +309,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
 
       IF(EXISTS ${SACADO_TRAD_HPP})
         LIST(APPEND CMAKE_REQUIRED_INCLUDES ${Trilinos_INCLUDE_DIRS})
-        ADD_FLAGS(CMAKE_REQUIRED_FLAGS "${DEAL_II_CXX_VERSION_FLAG}")
 
         CHECK_CXX_SOURCE_COMPILES(
           "
diff --git a/cmake/configure/configure_adolc.cmake b/cmake/configure/configure_adolc.cmake
index 6ad62473f8..3fdd33b0f0 100644
--- a/cmake/configure/configure_adolc.cmake
+++ b/cmake/configure/configure_adolc.cmake
@@ -98,7 +98,6 @@ MACRO(FEATURE_ADOLC_FIND_EXTERNAL var)
 
     LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${ADOLC_LIBRARIES})
     LIST(APPEND CMAKE_REQUIRED_INCLUDES ${ADOLC_INCLUDE_DIRS})
-    ADD_FLAGS(CMAKE_REQUIRED_FLAGS "${DEAL_II_CXX_VERSION_FLAG}")
 
     CHECK_CXX_SOURCE_COMPILES("
       #include <adolc/adouble.h>
diff --git a/doc/users/cmake_dealii.html b/doc/users/cmake_dealii.html
index 63bd88e763..f4e3b095c0 100644
--- a/doc/users/cmake_dealii.html
+++ b/doc/users/cmake_dealii.html
@@ -496,15 +496,6 @@ DEAL_II_WITH_ZLIB
       libraries.
     </p>
 
-    <p>
-      Additionally, the variable
-<pre class="cmake">
-DEAL_II_CXX_VERSION_FLAG
-</pre>
-      may be set to specify the <code>C++</code> language version flag passed to
-      the compiler.
-    </p>
-
     <p>
       There are some options to determine the behavior of the dependency
       resolution.
-- 
2.39.5