diff --git a/SetFlags.cmake b/SetFlags.cmake
index b4c7365fe..f8335cd25 100644
--- a/SetFlags.cmake
+++ b/SetFlags.cmake
@@ -285,6 +285,9 @@ macro(set_exe_flags)
 					add_flags_cxx("-Wno-documentation-unknown-command")
 				endif()
 			endif()
+			if ("${CLANG_VERSION}" VERSION_GREATER 3.5)
+				add_flags_cxx("-Wno-error=disabled-macro-expansion")
+			endif()
 		endif()
 	endif()