diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2018-04-27 23:22:41 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2018-04-27 23:22:41 +0200 |
| commit | 86a8fdf3fe0e4f21d49053acf29410346f247fab (patch) | |
| tree | 8d760a80ec3b86f6a2b0b8c8f6108485e3ee2483 | |
| parent | Fix fishing timer (#4217) (diff) | |
| download | cuberite-86a8fdf3fe0e4f21d49053acf29410346f247fab.tar cuberite-86a8fdf3fe0e4f21d49053acf29410346f247fab.tar.gz cuberite-86a8fdf3fe0e4f21d49053acf29410346f247fab.tar.bz2 cuberite-86a8fdf3fe0e4f21d49053acf29410346f247fab.tar.lz cuberite-86a8fdf3fe0e4f21d49053acf29410346f247fab.tar.xz cuberite-86a8fdf3fe0e4f21d49053acf29410346f247fab.tar.zst cuberite-86a8fdf3fe0e4f21d49053acf29410346f247fab.zip | |
| m--------- | lib/tolua++ | 0 | ||||
| -rw-r--r-- | src/Bindings/CMakeLists.txt | 5 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/tolua++ b/lib/tolua++ -Subproject 988cab37e47a9efd7366d0d43babc58e068968d +Subproject 4a814cf1759c8a1d0917344397a84c917c74de9 diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt index 7aaa5f3a6..2d1d4d57c 100644 --- a/src/Bindings/CMakeLists.txt +++ b/src/Bindings/CMakeLists.txt @@ -168,10 +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 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}") + set_source_files_properties(Bindings.cpp PROPERTIES COMPILE_FLAGS "-Wno-old-style-cast -Wno-missing-prototypes") endif() if(NOT MSVC) |