diff --git a/cmake/SfizzConfig.cmake b/cmake/SfizzConfig.cmake
index 52aefdc1..cfc910b0 100644
--- a/cmake/SfizzConfig.cmake
+++ b/cmake/SfizzConfig.cmake
@@ -1,5 +1,6 @@
 include(CMakeDependentOption)
 include(CheckCXXCompilerFlag)
+include(GNUWarnings)
 
 set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard to be used")
 set(CMAKE_C_STANDARD 99 CACHE STRING "C standard to be used")
@@ -61,10 +62,7 @@ endif()
 
 # Add required flags for the builds
 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-    add_compile_options(-Wall)
-    add_compile_options(-Wextra)
-    add_compile_options(-Wno-multichar)
-    add_compile_options(-Werror=return-type)
+    gw_warn(-Wall -Wextra -Wno-multichar -Werror=return-type)
     if (SFIZZ_SYSTEM_PROCESSOR MATCHES "^(i.86|x86_64)$")
         add_compile_options(-msse2)
     elseif(SFIZZ_SYSTEM_PROCESSOR MATCHES "^(arm.*)$")
diff --git a/editor/cmake/Vstgui.cmake b/editor/cmake/Vstgui.cmake
index 56e32ffb..a3cf5dc0 100644
--- a/editor/cmake/Vstgui.cmake
+++ b/editor/cmake/Vstgui.cmake
@@ -213,7 +213,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 endif()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-    target_compile_options(sfizz-vstgui PRIVATE
+    gw_target_warn(sfizz-vstgui PRIVATE
         "-Wno-deprecated-copy"
         "-Wno-deprecated-declarations"
         "-Wno-extra"
diff --git a/vst/CMakeLists.txt b/vst/CMakeLists.txt
index cf082daf..02421af5 100644
--- a/vst/CMakeLists.txt
+++ b/vst/CMakeLists.txt
@@ -141,7 +141,7 @@ else()
 endif()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-    target_compile_options(${VSTPLUGIN_PRJ_NAME} PRIVATE
+    gw_target_warn(${VSTPLUGIN_PRJ_NAME} PRIVATE
         "-Wno-extra"
         "-Wno-multichar"
         "-Wno-reorder"
@@ -317,7 +317,7 @@ elseif(SFIZZ_AU)
     endif()
 
     if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-        target_compile_options(${AUPLUGIN_PRJ_NAME} PRIVATE
+        gw_target_warn(${AUPLUGIN_PRJ_NAME} PRIVATE
             "-Wno-extra"
             "-Wno-multichar"
             "-Wno-reorder"