Merge branch release-2021 into merge-2021-into-master

[alexxy/gromacs.git] / cmake / FindLibStdCpp.cmake

diff --git a/cmake/FindLibStdCpp.cmake b/cmake/FindLibStdCpp.cmake
index 25c1038a6a330c0ef1af8680f63f45015d0c3a8e..f1f8684c93388729075d057093ab98bd25710750 100644 (file)
--- a/cmake/FindLibStdCpp.cmake
+++ b/cmake/FindLibStdCpp.cmake
@@ -128,10 +128,6 @@ if(NEED_TO_FIND_GPLUSPLUS)
             message(FATAL_ERROR "${GMX_GPLUSPLUS_PATH}/include/c++ doesn't exist even though it should. "
                 "Please report to developers.")
         endif()
-    else() #Intel
-        if (${GMX_GPLUSPLUS_VERSION} VERSION_GREATER_EQUAL 7 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
-            message(FATAL_ERROR "ICC versions below 19 don't support GCC versions above 6.")
-        endif ()
     endif()
 
     # Set up to use the libstdc++ from that g++. Note that we checked
@@ -139,8 +135,6 @@ if(NEED_TO_FIND_GPLUSPLUS)
     # we will not override any user settings here.
     if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "IntelLLVM")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${GMX_GPLUSPLUS_PATH}")
-    else() #Intel
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -gcc-name=${GMX_GPLUSPLUS_PATH}")
     endif()
 endif()