diff --git a/scripts/cmake/CompilerSetup.cmake b/scripts/cmake/CompilerSetup.cmake
index 7d12ff6edef3aeebb17188eecfe4c0180cbcb06f..62d66c2652561f92261b88d74faf880712802a79 100644
--- a/scripts/cmake/CompilerSetup.cmake
+++ b/scripts/cmake/CompilerSetup.cmake
@@ -40,10 +40,6 @@ if(COMPILER_IS_GCC OR COMPILER_IS_CLANG OR COMPILER_IS_INTEL)
             -D_GLIBCXX_DEBUG_VERIFY
         )
     endif()
-    add_compile_options(
-        -Wall
-        -Wextra
-    )
 
     # Coloring output
     option (FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." ON)
@@ -125,7 +121,6 @@ if(MSVC)
     endif()
     add_compile_options(
         /MP # multi-core compilation
-        /W3
         /wd4290 /wd4267 /wd4996
         /bigobj
         -D_CRT_SECURE_NO_WARNINGS
diff --git a/scripts/cmake/Functions.cmake b/scripts/cmake/Functions.cmake
index 2743b49040f7a68fbd85999641936cc0238d7f71..6b25af1a5db93b46140188d21465df8d121ff867 100644
--- a/scripts/cmake/Functions.cmake
+++ b/scripts/cmake/Functions.cmake
@@ -83,8 +83,8 @@ function(ogs_add_library targetName)
     add_library(${targetName} ${ARGN})
     target_compile_options(${targetName} PRIVATE
         $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,
-               $<CXX_COMPILER_ID:GNU>>:-Wall>
-        $<$<CXX_COMPILER_ID:MSVC>:/W4>)
+               $<CXX_COMPILER_ID:GNU>>:-Wall -Wextra>
+        $<$<CXX_COMPILER_ID:MSVC>:/W3>)
 
     if(BUILD_SHARED_LIBS)
         install(TARGETS ${targetName} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})