C++ flags: Add them in a failsafe manner

ecmwf · Mar 3, 2024 · 71cabbf · 71cabbf
1 parent 278ee34
commit 71cabbf
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -73,17 +73,11 @@ endif()
 ###############################################################################
 # some variables/options of this project
 
-if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
-    ecbuild_add_cxx_flags("-Wno-write-strings")
-    ecbuild_add_cxx_flags("-Wno-deprecated")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
-        ecbuild_add_cxx_flags("-Wno-write-strings")
-        ecbuild_add_cxx_flags("-Wno-deprecated")
-    else()
-        ecbuild_add_cxx_flags("-Wno-writable-strings")
-    endif()
-elseif( CMAKE_CXX_COMPILER_ID STREQUAL "Cray" )
+ecbuild_add_cxx_flags("-Wno-write-strings" NO_FAIL)
+ecbuild_add_cxx_flags("-Wno-writable-strings" NO_FAIL)
+ecbuild_add_cxx_flags("-Wno-deprecated" NO_FAIL)
+
+if( CMAKE_CXX_COMPILER_ID STREQUAL "Cray" )
     set(CMAKE_CXX_FLAGS "-hstd=c++11 ${CMAKE_CXX_FLAGS}")
 endif()