diff --git a/scripts/cmake/CompilerSetup.cmake b/scripts/cmake/CompilerSetup.cmake
index 8f60e4619c62c89746c5f17c219bd0b99ab32e78..4cc09e2b0a127770e9a95fbd3863cb8b504fc68a 100644
--- a/scripts/cmake/CompilerSetup.cmake
+++ b/scripts/cmake/CompilerSetup.cmake
@@ -43,16 +43,13 @@ IF(COMPILER_IS_GCC)
 					ENDIF()
 				ENDIF()
 		ENDIF()
-		# -g
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Wextra")
-		IF(COMPILER_IS_CLANG)
-			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas")
-		ELSE()
-			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-nonansi-builtins")
-		ENDIF() # COMPILER_IS_CLANG
-		ADD_DEFINITIONS( -DGCC -Wfatal-errors)
 ENDIF() # COMPILER_IS_GCC
 
+IF(COMPILER_IS_CLANG)
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -isystem ${CMAKE_SOURCE_DIR}/ThirdParty/ -Weverything -Wno-c++98-compat-pedantic")
+ENDIF() # COMPILER_IS_CLANG
+
 ### Intel compiler
 IF (COMPILER_IS_INTEL)
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")