Port to C++-17

Author: thelfer

CMakeLists.txt

@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 3.0)
 include(cmake/modules/mgis.cmake)
 project("mfront-generic-interface")
 
+set(CMAKE_CXX_STANDARD 17)
+set(CXX_STANDARD_REQUIRED ON)
+
 # portable-build
 option(enable-portable-build "produce binary that can be shared between various machine (same architecture, same gcc version, different processors" OFF)
 

cmake/modules/clang.cmake

@@ -44,11 +44,6 @@ if(enable-libcxx)
   tfel_enable_cxx_compiler_flag(COMPILER_CXXFLAGS "stdlib=libc++")
 endif(enable-libcxx)
 
-if(${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 3.4)
-  message(FATAL_ERROR "C++11 support is only available for clang version >= 3.4")
-endif(${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 3.4)
-set(COMPILER_CXXFLAGS "${COMPILER_CXXFLAGS} -std=c++11")
-
 option(enable-sanitize-options "enable various clang sanitize options (undefined, address,...)" OFF)
 
 if(enable-sanitize-options)

cmake/modules/compiler.cmake

@@ -140,11 +140,6 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
   include(cmake/modules/intel.cmake)
 elseif((CMAKE_CXX_COMPILER_ID STREQUAL "PathScale") OR (PATHSCALE_COMPILER))
   include(cmake/modules/pathscale.cmake)
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
-  set(COMPILER_CXXFLAGS "${COMPILER_CXXFLAGS} -std=c++11")
-  set(OPTIMISATION_FLAGS "-DNO_RUNTIME_CHECK_BOUNDS ${OPTIMISATION_FLAGS}")
-  # add_definitions("-library=stlport4")
-  # message(FATAL_ERROR "MFRONT C++11 support is not availabable with the SunPro compiler")
 elseif(MSVC)
   include(cmake/modules/msvc.cmake)
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "PGI")

cmake/modules/gcc.cmake

@@ -107,19 +107,6 @@ if(enable-sanitize-options)
   tfel_enable_cxx_compiler_flag(COMPILER_FLAGS "fno-omit-frame-pointer")
 endif(enable-sanitize-options)
 
-option(enable-cxx-17 "enable support of the C++17 standard")
-if(enable-cxx-17)
-  if(${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 7.2)
-    message(FATAL_ERROR "C++17 support is only available for gcc version >= 7.2")
-  endif(${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 7.2)
-  set(COMPILER_FLAGS "-std=c++17 ${COMPILER_FLAGS}")
-else(enable-cxx-17)
-  if(${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4.7)
-    message(FATAL_ERROR "C++11 support is only available for gcc version >= 4.7")
-  endif(${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4.7)
-  set(COMPILER_CXXFLAGS "${COMPILER_CXXFLAGS} -std=c++11")  
-endif(enable-cxx-17)
-
 # basic C support
 set(COMPILER_C_WARNINGS "-Wall -W -pedantic")
 

cmake/modules/intel.cmake

@@ -1,5 +1,3 @@
-set(COMPILER_CXXFLAGS "${COMPILER_CXXFLAGS} -std=c++11")
-
 tfel_enable_cxx_compiler_flag(COMPILER_WARNINGS  "Wall")
 # 383 : value copied to temporary, reference to temporary used
 # 981 : operands are evaluated in unspecified order

cmake/modules/pathscale.cmake

@@ -24,5 +24,3 @@ if(HAVE_FORTRAN)
     message(FATAL_ERROR "unsupported fortran compiler ${CMAKE_Fortran_COMPILER_NAME}")
   endif(${CMAKE_Fortran_COMPILER_ID} STREQUAL "PathScale")
 endif(HAVE_FORTRAN)
-
-set(COMPILER_CXXFLAGS "${COMPILER_CXXFLAGS} -std=c++11")

cmake/modules/pgi.cmake

@@ -3,7 +3,6 @@ if(NOT enable-fast-math)
   tfel_enable_cxx_compiler_flag(OPTIMISATION_FLAGS  "Kieee")
 endif(NOT enable-fast-math)
 
-set(COMPILER_CXXFLAGS "${COMPILER_CXXFLAGS} -std=c++11")
 set(OPTIMISATION_FLAGS "-DNO_RUNTIME_CHECK_BOUNDS ${OPTIMISATION_FLAGS}")
 if((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "Release"))
   set(OPTIMISATION_FLAGS "-Minline -Mipa -DNDEBUG ${OPTIMISATION_FLAGS}")

cmake/modules/tfel.cmake

@@ -52,7 +52,7 @@ IF(TFEL_CONFIG AND MFRONT AND MFRONT_QUERY)
   LIST(GET TFEL_VERSION_FULL 1 TFEL_VERSION)
 
   if(NOT TFEL_CXX_STANDARD_AVAILABLE EQUAL 0)
-    set(TFEL_CXX_STANDARD 11)
+    set(TFEL_CXX_STANDARD 17)
   endif(NOT TFEL_CXX_STANDARD_AVAILABLE EQUAL 0)
 
   EXECUTE_PROCESS(COMMAND ${TFEL_CONFIG} "--python-version"