From 51b4584b425bbc9c96b4967b9391479768d3cb28 Mon Sep 17 00:00:00 2001
From: tycho <work.tycho@gmail.com>
Date: Sun, 24 May 2015 15:22:55 +0100
Subject: Fix clang 3.6 flags to only be used in clang 3.6

---
 SetFlags.cmake               | 24 ++++++++++++++----------
 tests/Network/CMakeLists.txt |  5 ++++-
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/SetFlags.cmake b/SetFlags.cmake
index c20a45133..d824d054a 100644
--- a/SetFlags.cmake
+++ b/SetFlags.cmake
@@ -27,6 +27,16 @@ macro(add_flags_cxx FLAGS)
 endmacro()
 
 
+#this is a hack because we can't use cmake 2.8.10 because of travis
+macro(get_clang_version)
+	execute_process(
+		COMMAND "${CMAKE_CXX_COMPILER}" "--version"
+		OUTPUT_VARIABLE CLANG_VERSION_OUTPUT)
+	string(REGEX MATCH "version ([0-9]\\.[0-9])" x ${CLANG_VERSION_OUTPUT})
+	set(CLANG_VERSION ${CMAKE_MATCH_1})
+endmacro()
+
+
 macro(set_flags)
 	# Add coverage processing, if requested:
 	if (NOT MSVC)
@@ -113,6 +123,10 @@ macro(set_flags)
 		add_flags_cxx("-march=native")
 	endif()
 
+	if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+        get_clang_version()
+    endif()
+
 
 	# Use static CRT in MSVC builds:
 	if (MSVC)
@@ -215,15 +229,6 @@ macro(enable_profile)
 	endif()
 endmacro()
 
-#this is a hack because we can't use cmake 2.8.10 because of travis
-macro(get_clang_version)
-	execute_process(
-		COMMAND "${CMAKE_CXX_COMPILER}" "--version"
-		OUTPUT_VARIABLE CLANG_VERSION_OUTPUT)
-	string(REGEX MATCH "version ([0-9]\\.[0-9])" x ${CLANG_VERSION_OUTPUT})
-	set(CLANG_VERSION ${CMAKE_MATCH_1})
-endmacro()
-
 macro(set_exe_flags)
 	# Remove disabling the maximum warning level:
 	# clang does not like a command line that reads -Wall -Wextra -w -Wall -Wextra and does not output any warnings
@@ -242,7 +247,6 @@ macro(set_exe_flags)
 		add_flags_cxx("-ffast-math")
 
 		if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-			get_clang_version()
 			if ("${CLANG_VERSION}" VERSION_LESS 3.0)
 				message(FATAL_ERROR "MCServer requires clang version 3.0 or higher, version is ${CLANG_VERSION}")
 			endif()
diff --git a/tests/Network/CMakeLists.txt b/tests/Network/CMakeLists.txt
index 9ba5801f4..f93ccad8e 100644
--- a/tests/Network/CMakeLists.txt
+++ b/tests/Network/CMakeLists.txt
@@ -42,7 +42,10 @@ if (MSVC)
 endif()
 
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-	add_flags_cxx("-Wno-error=conversion -Wno-error=old-style-cast -Wno-error=inconsistent-missing-override")
+	add_flags_cxx("-Wno-error=conversion -Wno-error=old-style-cast")
+	if ("${CLANG_VERSION}" VERSION_GREATER 3.5)
+		add_flags_cxx("-Wno-error=inconsistent-missing-override")
+	endif()
 endif()
 
 # Define individual tests:
-- 
cgit v1.2.3