From a7232499ac78ae85346cac43254eea4ee156dc90 Mon Sep 17 00:00:00 2001 From: lethosor Date: Wed, 30 Dec 2020 00:04:49 -0500 Subject: [PATCH] Silence some warnings from GCC 10 Specifically `gcc (Ubuntu 10.2.0-13ubuntu1) 10.2.0` --- depends/CMakeLists.txt | 3 +++ depends/libzip | 2 +- depends/lua/CMakeLists.txt | 1 + plugins/remotefortressreader/remotefortressreader.cpp | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt index 3d7e18da7..b95831cdd 100644 --- a/depends/CMakeLists.txt +++ b/depends/CMakeLists.txt @@ -12,6 +12,9 @@ add_subdirectory(tthread) option(JSONCPP_WITH_TESTS "Compile and (for jsoncpp_check) run JsonCpp test executables" OFF) option(JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" OFF) add_subdirectory(jsoncpp-sub EXCLUDE_FROM_ALL) +if(UNIX) + set_target_properties(jsoncpp_lib_static PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations") +endif() # build clsocket static and only as a dependency. Setting those options here overrides its own default settings. option(CLSOCKET_SHARED "Build clsocket lib as shared." OFF) option(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON) diff --git a/depends/libzip b/depends/libzip index be76fa508..da0d18ae5 160000 --- a/depends/libzip +++ b/depends/libzip @@ -1 +1 @@ -Subproject commit be76fa5086bfe6b1a5e83c9855e39f98edc1f066 +Subproject commit da0d18ae59ef2699013316b703cdc93809414c93 diff --git a/depends/lua/CMakeLists.txt b/depends/lua/CMakeLists.txt index f286d4827..c3ff0c16f 100644 --- a/depends/lua/CMakeLists.txt +++ b/depends/lua/CMakeLists.txt @@ -100,6 +100,7 @@ if(MSVC) target_compile_options(lua PRIVATE "/FIdfhack_llimits.h") else() target_compile_options(lua PRIVATE -include dfhack_llimits.h) + set_source_files_properties(src/lstring.c PROPERTIES COMPILE_FLAGS "-Wno-stringop-overflow") endif() install(TARGETS lua diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp index 44c476357..476572110 100644 --- a/plugins/remotefortressreader/remotefortressreader.cpp +++ b/plugins/remotefortressreader/remotefortressreader.cpp @@ -1081,7 +1081,7 @@ void CopyDesignation(df::map_block * DfBlock, RemoteFortressReader::MapBlock * N if (gamemode && (*gamemode == game_mode::ADVENTURE)) { auto fog_of_war = DfBlock->fog_of_war[xx][yy]; - NetBlock->add_hidden(designation.bits.dig == TileDigDesignation::NO_DIG || designation.bits.hidden); + NetBlock->add_hidden((TileDigDesignation)designation.bits.dig == TileDigDesignation::NO_DIG || designation.bits.hidden); NetBlock->add_tile_dig_designation(TileDigDesignation::NO_DIG); NetBlock->add_tile_dig_designation_marker(false); NetBlock->add_tile_dig_designation_auto(false);