diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ad38aec188..8064e69c351 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,11 +147,18 @@ ELSE(IS_ABSOLUTE ${INCLUDE_INSTALL_DIR})
 ENDIF(IS_ABSOLUTE ${INCLUDE_INSTALL_DIR})
 
 MACRO(ENABLE_WARNINGS flag)
-	ADD_C_FLAG_IF_SUPPORTED(-W${flag})
+	IF(ENABLE_WERROR)
+		ADD_C_FLAG_IF_SUPPORTED(-Werror=${flag})
+	ELSE()
+		ADD_C_FLAG_IF_SUPPORTED(-W${flag})
+	ENDIF()
 ENDMACRO()
 
 MACRO(DISABLE_WARNINGS flag)
 	ADD_C_FLAG_IF_SUPPORTED(-Wno-${flag})
+	IF(ENABLE_WERROR)
+		ADD_C_FLAG_IF_SUPPORTED(-Wno-error=${flag})
+	ENDIF()
 ENDMACRO()
 
 FUNCTION(TARGET_OS_LIBRARIES target)