summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2017-12-22 19:25:46 +0100
committerAlexander Harkness <me@bearbin.net>2017-12-22 19:25:46 +0100
commit832b39471512fa9543f981053573fb6b3342a396 (patch)
tree5738e02d526f882f9497d4d7d44d0e3aa9043230 /src
parentFix typo in #4095. (diff)
downloadcuberite-832b39471512fa9543f981053573fb6b3342a396.tar
cuberite-832b39471512fa9543f981053573fb6b3342a396.tar.gz
cuberite-832b39471512fa9543f981053573fb6b3342a396.tar.bz2
cuberite-832b39471512fa9543f981053573fb6b3342a396.tar.lz
cuberite-832b39471512fa9543f981053573fb6b3342a396.tar.xz
cuberite-832b39471512fa9543f981053573fb6b3342a396.tar.zst
cuberite-832b39471512fa9543f981053573fb6b3342a396.zip
Diffstat (limited to '')
-rw-r--r--src/Bindings/CMakeLists.txt2
-rw-r--r--src/main.cpp10
2 files changed, 7 insertions, 5 deletions
diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt
index 45bd573d5..004d8be30 100644
--- a/src/Bindings/CMakeLists.txt
+++ b/src/Bindings/CMakeLists.txt
@@ -168,7 +168,7 @@ set_source_files_properties(${BINDING_OUTPUTS} PROPERTIES GENERATED TRUE)
set_source_files_properties(${CMAKE_SOURCE_DIR}/src/Bindings/Bindings.cpp PROPERTIES COMPILE_FLAGS -Wno-error)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
- if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5) # Workaround for VERSION_GREATER_EQUAL, which is only supported on CMake 3.7+
+ if(NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5) # Workaround for VERSION_GREATER_EQUAL, which is only supported on CMake 3.7+
set(ADDITIONAL_FLAGS "-Wno-zero-as-null-pointer-constant")
endif()
set_source_files_properties(Bindings.cpp PROPERTIES COMPILE_FLAGS "-Wno-old-style-cast -Wno-missing-prototypes ${ADDITIONAL_FLAGS}")
diff --git a/src/main.cpp b/src/main.cpp
index 5e6872a9a..e1ed078e0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -73,10 +73,12 @@ bool cRoot::m_RunAsService = false;
#ifndef _DEBUG
// Because SIG_DFL or SIG_IGN could be NULL instead of nullptr, we need to disable the Clang warning here
-#if __clang_major__ >= 5
+#ifdef __clang__
#pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wunknown-warning-option"
+ #pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif
+#endif // __clang__
static void NonCtrlHandler(int a_Signal)
{
@@ -122,9 +124,9 @@ static void NonCtrlHandler(int a_Signal)
}
}
-#if __clang_major__ >= 5
+#ifdef __clang__
#pragma clang diagnostic pop
-#endif
+#endif // __clang__
#endif // _DEBUG