Merge branch 'master' into PreventNewWarnings

2015-05-23 07:33:52 -07:00
parent b29ae54d91 7e0dc0f9bc
commit 81c0116cf1
19 changed files with 46 additions and 42 deletions
--- a/SetFlags.cmake
+++ b/SetFlags.cmake
@@ -258,6 +258,10 @@ macro(set_exe_flags)
 				# flags introduced in 3.2
 				add_flags_cxx("-Wno-documentation")
 			endif()
+			if ("${CLANG_VERSION}" VERSION_GREATER 3.5)
+				# Use this flag to ignore error for a reserved macro problem in sqlite 3
+				add_flags_cxx("-Wno-reserved-id-macro")
+			endif()
 		endif()
 	endif()