diff options
| author | tycho <work.tycho@gmail.com> | 2015-05-23 13:59:41 +0200 |
|---|---|---|
| committer | tycho <work.tycho@gmail.com> | 2015-05-23 14:21:02 +0200 |
| commit | a5624debcb15f5edadeb598d86b4b8ee738d03bd (patch) | |
| tree | de7e37a2405d004830c418e96910b4dd483c4866 | |
| parent | Disable warnings in MCADefrag, ProtoProxy and tests (diff) | |
| download | cuberite-a5624debcb15f5edadeb598d86b4b8ee738d03bd.tar cuberite-a5624debcb15f5edadeb598d86b4b8ee738d03bd.tar.gz cuberite-a5624debcb15f5edadeb598d86b4b8ee738d03bd.tar.bz2 cuberite-a5624debcb15f5edadeb598d86b4b8ee738d03bd.tar.lz cuberite-a5624debcb15f5edadeb598d86b4b8ee738d03bd.tar.xz cuberite-a5624debcb15f5edadeb598d86b4b8ee738d03bd.tar.zst cuberite-a5624debcb15f5edadeb598d86b4b8ee738d03bd.zip | |
| -rw-r--r-- | src/Generating/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/OSSupport/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/Network/CMakeLists.txt | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/Generating/CMakeLists.txt b/src/Generating/CMakeLists.txt index 42c9d14e0..8167b8ec7 100644 --- a/src/Generating/CMakeLists.txt +++ b/src/Generating/CMakeLists.txt @@ -78,6 +78,8 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set_source_files_properties(ComposableGenerator.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=switch-enum") set_source_files_properties(FinishGen.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=switch-enum -Wno-error=switch") set_source_files_properties(NetherFortGen.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=global-constructors") + set_source_files_properties(PieceGenerator.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=global-constructors") + set_source_files_properties(Prefab.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=global-constructors") set_source_files_properties(RainbowRoadsGen.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=global-constructors") set_source_files_properties(RoughRavines.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=float-equal") set_source_files_properties(StructGen.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=switch-enum -Wno-error=switch") diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt index 0d3c9a63e..981c4c5b0 100644 --- a/src/OSSupport/CMakeLists.txt +++ b/src/OSSupport/CMakeLists.txt @@ -41,6 +41,10 @@ SET (HDRS UDPEndpointImpl.h ) +if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + add_flags_cxx("-Wno-error=global-constructors") +endif() + if(NOT MSVC) add_library(OSSupport ${SRCS} ${HDRS}) diff --git a/tests/Network/CMakeLists.txt b/tests/Network/CMakeLists.txt index c0af50e2c..7412b16ad 100644 --- a/tests/Network/CMakeLists.txt +++ b/tests/Network/CMakeLists.txt @@ -41,8 +41,9 @@ if (MSVC) target_link_libraries(Network ws2_32.lib) endif() - - +if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + add_flags_cxx("-Wno-error=conversion") +endif() # Define individual tests: |