From f7b6d5bbe4315ffb96c4e35c4115899e51030820 Mon Sep 17 00:00:00 2001 From: Ingo Ruhnke Date: Sun, 31 Aug 2014 07:34:21 +0200 Subject: [PATCH] Disabled -Wlogical-op, as that fails on clang --- .gitignore | 3 ++- CMakeLists.txt | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e5de41d6f..a2293f0b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Build Files -build/* +build/ +build.*/ supertux2 # Additional Repos/Translations diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c7f7432a..f8bd259bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,7 +272,9 @@ IF(CMAKE_COMPILER_IS_GNUCC) # -Wold-style-cast -Wpadded -Wabi -Winline -Wunsafe-loop-optimizations -Wstrict-overflow=5 # fails on MinGW: # -ansi - SET(SUPERTUX2_EXTRA_WARNING_FLAGS "-fdiagnostics-show-option -pedantic -Wno-long-long -Wcast-align -Wdisabled-optimization -Winit-self -Winvalid-pch -Wlogical-op -Wmissing-include-dirs -Wmissing-noreturn -Wpacked -Wredundant-decls -Wstack-protector -Wformat=2 -Weffc++ -Wctor-dtor-privacy -Wstrict-null-sentinel -Wno-unused-parameter -Wshadow -Wnon-virtual-dtor -Wcast-qual") + # fails on clang: + # -Wlogical-op + SET(SUPERTUX2_EXTRA_WARNING_FLAGS "-fdiagnostics-show-option -pedantic -Wno-long-long -Wcast-align -Wdisabled-optimization -Winit-self -Winvalid-pch -Wmissing-include-dirs -Wmissing-noreturn -Wpacked -Wredundant-decls -Wstack-protector -Wformat=2 -Weffc++ -Wctor-dtor-privacy -Wstrict-null-sentinel -Wno-unused-parameter -Wshadow -Wnon-virtual-dtor -Wcast-qual") ENDIF(WARNINGS) ENDIF(CMAKE_COMPILER_IS_GNUCC) -- 2.11.0