diff options
| -rw-r--r-- | dep/CascLib/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | dep/zmqpp/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/dep/CascLib/CMakeLists.txt b/dep/CascLib/CMakeLists.txt index 429ebfb78e8..7217e8642f4 100644 --- a/dep/CascLib/CMakeLists.txt +++ b/dep/CascLib/CMakeLists.txt @@ -39,4 +39,9 @@ set(TOMCRYPT_FILES include_directories(${CMAKE_SOURCE_DIR}/dep) +# Turn off warnings for casclib till the sources are updated +IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") + set_source_files_properties(Common.cpp PROPERTIES COMPILE_FLAGS -Wno-char-subscripts) +endif() + add_library(casc STATIC ${SRC_FILES} ${TOMCRYPT_FILES}) diff --git a/dep/zmqpp/CMakeLists.txt b/dep/zmqpp/CMakeLists.txt index 4166d4fd8b3..1792bc0a4f3 100644 --- a/dep/zmqpp/CMakeLists.txt +++ b/dep/zmqpp/CMakeLists.txt @@ -20,6 +20,11 @@ add_library(zmqpp STATIC ${zmqpp_STAT_SRCS} ) +# Turn off warnings for zmqpp till the sources are updated +IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") + set_source_files_properties(socket.cpp PROPERTIES COMPILE_FLAGS -Wno-unused-const-variable) +endif() + if (WIN32) add_definitions(-DBUILD_VERSION=\\"3.2.0\\") else() diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 7c43ec33ab2..f5db7db13a3 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2582,7 +2582,7 @@ void Creature::SetTextRepeatId(uint8 textGroup, uint8 id) if (std::find(repeats.begin(), repeats.end(), id) == repeats.end()) repeats.push_back(id); else - TC_LOG_ERROR("sql.sql", "CreatureTextMgr: TextGroup %u for Creature (%s) %s, id %u already added", uint32(textGroup), GetName().c_str(), GetGUID().ToString().c_str(), uint32(id)); + TC_LOG_ERROR("sql.sql", "CreatureTextMgr: TextGroup %u for Creature (%s) %s, id %u already added", uint32(textGroup), GetName().c_str(), GetGUID().ToString().c_str(), uint32(id)); } CreatureTextRepeatIds Creature::GetTextRepeatGroup(uint8 textGroup) |