diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bc667d3..7a32bde1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,7 +221,12 @@ if( EC_OS_NAME MATCHES "windows" )
 
 else()
 
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -Wno-overloaded-virtual -Wno-unused-variable -Wno-reorder -Wno-sign-compare")
+  # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -Wno-overloaded-virtual -Wno-unused-variable -Wno-reorder -Wno-sign-compare")
+  ecbuild_add_cxx_flags("-Wno-unused-parameter" NO_FAIL)
+  ecbuild_add_cxx_flags("-Wno-overloaded-virtual" NO_FAIL)
+  ecbuild_add_cxx_flags("-Wno-unused-variable" NO_FAIL)
+  ecbuild_add_cxx_flags("-Wno-reorder" NO_FAIL)
+  ecbuild_add_cxx_flags("-Wno-sign-compare" NO_FAIL)
 
   # set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-overloaded-virtual -Wno-unused-variable -Wno-reorder-ctor -Wno-sign-compare")