diff --git a/ext/ghoul b/ext/ghoul
index a865235d5e..0c76e6c559 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit a865235d5e932ec0d1b635f8de0a9cdc3f2e39d2
+Subproject commit 0c76e6c55961d6c1bde2c5ee67ad2f9993d1123a
diff --git a/support/cmake/support_macros.cmake b/support/cmake/support_macros.cmake
index 7bb368e2e3..417dd73d50 100644
--- a/support/cmake/support_macros.cmake
+++ b/support/cmake/support_macros.cmake
@@ -81,13 +81,8 @@ function (set_compile_settings)
     if (MSVC)
         target_compile_options(libOpenSpace PUBLIC "/MP" "/wd4201" "/wd4127")
         if (OPENSPACE_WARNINGS_AS_ERRORS)
-            if (MSVC)
-                target_compile_options(libOpenSpace PUBLIC "/WX")
-                target_compile_options(OpenSpace PUBLIC "/WX")
-            else ()
-                target_compile_options(libOpenSpace PUBLIC "-Werror")
-                target_compile_options(OpenSpace PUBLIC "-Werror")
-            endif ()
+            target_compile_options(libOpenSpace PUBLIC "/WX")
+            target_compile_options(OpenSpace PUBLIC "/WX")
         endif ()
 
         set_target_properties(OpenSpace PROPERTIES LINK_FLAGS
@@ -108,6 +103,11 @@ function (set_compile_settings)
           message(FATAL_ERROR "Compiler does not have C++11 support")
         endif ()
 
+        if (OPENSPACE_WARNINGS_AS_ERRORS)
+            target_compile_options(libOpenSpace PUBLIC "-Werror")
+            target_compile_options(OpenSpace PUBLIC "-Werror")
+        endif ()
+
         target_compile_options(libOpenSpace PUBLIC "-stdlib=libc++")
 
         target_include_directories(libOpenSpace PUBLIC "/Developer/Headers/FlatCarbon")
@@ -135,6 +135,11 @@ function (set_compile_settings)
             message(FATAL_ERROR "Compiler does not have C++11 support")
           endif ()
 
+        if (OPENSPACE_WARNINGS_AS_ERRORS)
+            target_compile_options(libOpenSpace PUBLIC "-Werror")
+            target_compile_options(OpenSpace PUBLIC "-Werror")
+        endif ()
+
         target_compile_options(libOpenSpace PUBLIC "-ggdb")
     endif ()
 endfunction ()