diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3c834d59..9c64f960d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,7 @@ if (NIGIRI_LINT)
   include(cmake/clang-tidy.cmake)
 endif ()
 
+set(CMAKE_COMPILE_WARNING_AS_ERROR ON)
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   set(nigiri-compile-options
         -Weverything
@@ -66,20 +67,14 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
         -Wno-ctad-maybe-unsupported
         -Wno-nrvo
         -Wno-thread-safety-negative
-        -Wno-unused-private-field
-        -Werror)
+        -Wno-unused-private-field)
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
-  set(nigiri-compile-options -Wall -Wextra -Werror)
-elseif (MSVC)
-  set(nigiri-compile-options /WX)
-else ()
+  set(nigiri-compile-options -Wall -Wextra)
+elseif (NOT MSVC)
   set(nigiri-compile-options
         -Wall
         -Wextra
         -Wno-maybe-uninitialized)
-  if (NOT CMAKE_CROSSCOMPILING)
-    set(nigiri-compile-options ${nigiri-compile-options} -Werror)
-  endif ()
 endif ()