From 77f1f58c0a7eb55001b375f1945690ed5c1e87a2 Mon Sep 17 00:00:00 2001
From: tycho <work.tycho@gmail.com>
Date: Tue, 19 May 2015 19:32:10 +0100
Subject: Make -Werror disabling file only Ad fix a load of warnings

---
 SetFlags.cmake | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

(limited to 'SetFlags.cmake')

diff --git a/SetFlags.cmake b/SetFlags.cmake
index 0d1bd99b3..b26796522 100644
--- a/SetFlags.cmake
+++ b/SetFlags.cmake
@@ -16,8 +16,8 @@ macro (add_flags_lnk FLAGS)
 endmacro()
 
 macro(add_flags_cxx FLAGS)
-	set(CMAKE_CXX_FLAGS          "${CMAKE_CXX_FLAGS}          ${FLAGS}")
-	set(CMAKE_C_FLAGS            "${CMAKE_C_FLAGS}            ${FLAGS}")
+	#set(CMAKE_CXX_FLAGS          "${CMAKE_CXX_FLAGS}          ${FLAGS}")
+	#set(CMAKE_C_FLAGS            "${CMAKE_C_FLAGS}            ${FLAGS}")
 	set(CMAKE_CXX_FLAGS_DEBUG    "${CMAKE_CXX_FLAGS_DEBUG}    ${FLAGS}")
 	set(CMAKE_C_FLAGS_DEBUG      "${CMAKE_C_FLAGS_DEBUG}      ${FLAGS}")
 	set(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_COVERAGE} ${FLAGS}")
@@ -235,7 +235,7 @@ macro(set_exe_flags)
 		string(REPLACE "-w" "" CMAKE_C_FLAGS_DEBUG      "${CMAKE_C_FLAGS_DEBUG}")
 		string(REPLACE "-w" "" CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_COVERAGE}")
 		string(REPLACE "-w" "" CMAKE_C_FLAGS_COVERAGE   "${CMAKE_C_FLAGS_COVERAGE}")
-		add_flags_cxx("-Wall -Wextra -Wno-unused-parameter -Wno-error=switch")
+		add_flags_cxx("-Wall -Wextra -Wno-unused-parameter")
 
 		# we support non-IEEE 754 fpus so can make no guarentees about error
 		add_flags_cxx("-ffast-math")
@@ -248,16 +248,10 @@ macro(set_exe_flags)
 			# clang does not provide the __extern_always_inline macro and a part of libm depends on this when using fast-math
 			add_flags_cxx("-D__extern_always_inline=inline")
 			add_flags_cxx("-Werror -Weverything -Wno-c++98-compat-pedantic -Wno-string-conversion")
-			add_flags_cxx("-Wno-exit-time-destructors -Wno-padded")
-			add_flags_cxx("-Wno-error=sign-conversion -Wno-error=conversion -Wno-error=deprecated")
-			add_flags_cxx("-Wno-error=missing-prototypes")
-			add_flags_cxx("-Wno-error=shadow -Wno-error=old-style-cast -Wno-error=global-constructors")
-			add_flags_cxx("-Wno-error=float-equal")
-			add_flags_cxx("-Wno-weak-vtables -Wno-switch-enum")
+			add_flags_cxx("-Wno-exit-time-destructors -Wno-padded -Wno-weak-vtables")
 			if ("${CLANG_VERSION}" VERSION_GREATER 3.0)
 				# flags that are not present in 3.0
-				add_flags_cxx("-Wno-error=covered-switch-default -Wno-error=missing-variable-declarations")
-				add_flags_cxx("-Wno-implicit-fallthrough -Wno-error=extra-semi")
+				add_flags_cxx("-Wno-implicit-fallthrough")
 			endif()
 			if ("${CLANG_VERSION}" VERSION_GREATER 3.1)
 				# flags introduced in 3.2
@@ -267,3 +261,21 @@ macro(set_exe_flags)
 	endif()
 
 endmacro()
+
+#	if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+#		foreach(FILENAME ${ARGN})
+#			message("downgrade_warnings for ${FILENAME}")
+#			set_source_files_properties(${FILENAME} PROPERTIES COMPILE_FLAGS "-Wno-error=sign-conversion -Wno-error=conversion")
+#			set_source_files_properties(${FILENAME} PROPERTIES COMPILE_FLAGS "-Wno-error=missing-prototypes -Wno-error=deprecated")
+#			set_source_files_properties(${FILENAME} PROPERTIES COMPILE_FLAGS "-Wno-error=shadow -Wno-error=old-style-cast  -Wno-error=switch-enum -Wno-error=switch")
+#			set_source_files_properties(${FILENAME} PROPERTIES COMPILE_FLAGS "-Wno-error=float-equal -Wno-error=global-constructors")
+			
+#			if ("${CLANG_VERSION}" VERSION_GREATER 3.0)
+#				# flags that are not present in 3.0
+#				set_source_files_properties(${FILENAME} PROPERTIES COMPILE_FLAGS "-Wno-error=covered-switch-default ")
+#				set_source_files_properties(${FILENAME} PROPERTIES COMPILE_FLAGS "-Wno-implicit-fallthrough -Wno-error=extra-semi")
+#				set_source_files_properties(${FILENAME} PROPERTIES COMPILE_FLAGS "-Wno-error=missing-variable-declarations")
+#			endif()
+#		endforeach()
+#	endif()
+
-- 
cgit v1.2.3