From 62c99145d0775bb41d210917e064cf257de41df1 Mon Sep 17 00:00:00 2001 From: tycho Date: Sat, 23 May 2015 12:27:55 +0100 Subject: Disable warnings in MCADefrag, ProtoProxy and tests --- Tools/MCADefrag/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Tools/MCADefrag') diff --git a/Tools/MCADefrag/CMakeLists.txt b/Tools/MCADefrag/CMakeLists.txt index 700310edc..a4096791d 100644 --- a/Tools/MCADefrag/CMakeLists.txt +++ b/Tools/MCADefrag/CMakeLists.txt @@ -11,8 +11,9 @@ set_flags() set_lib_flags() enable_profile() - - +if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + add_flags_cxx("-Wno-error=sign-conversion -Wno-error=conversion -Wno-error=shorten-64-to-32") +endif() # Set include paths to the used libraries: include_directories("../../lib") -- cgit v1.2.3 From 7a8025eacd28388b70a180f0b3348b09c4f14cf0 Mon Sep 17 00:00:00 2001 From: tycho Date: Sun, 24 May 2015 13:24:34 +0100 Subject: Disable -Werror for warnings in tools. --- Tools/MCADefrag/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Tools/MCADefrag') diff --git a/Tools/MCADefrag/CMakeLists.txt b/Tools/MCADefrag/CMakeLists.txt index a4096791d..17e332d8d 100644 --- a/Tools/MCADefrag/CMakeLists.txt +++ b/Tools/MCADefrag/CMakeLists.txt @@ -12,7 +12,8 @@ set_lib_flags() enable_profile() if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - add_flags_cxx("-Wno-error=sign-conversion -Wno-error=conversion -Wno-error=shorten-64-to-32") + add_flags_cxx("-Wno-error=sign-conversion -Wno-error=conversion -Wno-error=shorten-64-to-32 -Wno-error=keyword-macro") + add_flags_cxx("-Wno-error=old-style-cast") endif() # Set include paths to the used libraries: -- cgit v1.2.3 From c627016ea684d6d778499e05536da2217c0cff93 Mon Sep 17 00:00:00 2001 From: tycho Date: Sun, 24 May 2015 16:58:53 +0100 Subject: Fix other clang 3.6 commit --- Tools/MCADefrag/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Tools/MCADefrag') diff --git a/Tools/MCADefrag/CMakeLists.txt b/Tools/MCADefrag/CMakeLists.txt index 17e332d8d..9d600d3ec 100644 --- a/Tools/MCADefrag/CMakeLists.txt +++ b/Tools/MCADefrag/CMakeLists.txt @@ -12,8 +12,11 @@ set_lib_flags() enable_profile() if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - add_flags_cxx("-Wno-error=sign-conversion -Wno-error=conversion -Wno-error=shorten-64-to-32 -Wno-error=keyword-macro") + add_flags_cxx("-Wno-error=sign-conversion -Wno-error=conversion -Wno-error=shorten-64-to-32") add_flags_cxx("-Wno-error=old-style-cast") + if ("${CLANG_VERSION}" VERSION_GREATER 3.5) + add_flags_cxx("-Wno-error=keyword-macro") + endif() endif() # Set include paths to the used libraries: -- cgit v1.2.3