aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNaios <naios-dev@live.de>2016-03-12 14:30:11 +0100
committerNaios <naios-dev@live.de>2016-03-16 16:12:04 +0100
commit37dbbe22eb8e7bdc14be08d854b9ca3af9ad7d6b (patch)
treeef649dce69beb2c3ab0dc77ab9745038324a0e4f /src
parenta56a402190c885e51038df55654875cc9e875c03 (diff)
Dep/CppFormat: Update cppformat to cppformat/cppformat@5174b8c
(cherry picked from commit f52495c66b1b219f82729221e8023a86b28d54bf)
Diffstat (limited to 'src')
-rw-r--r--src/common/Utilities/StringFormat.h2
-rw-r--r--src/server/bnetserver/CMakeLists.txt2
-rw-r--r--src/server/worldserver/CMakeLists.txt2
-rw-r--r--src/tools/map_extractor/CMakeLists.txt2
-rw-r--r--src/tools/mmaps_generator/CMakeLists.txt2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/common/Utilities/StringFormat.h b/src/common/Utilities/StringFormat.h
index d85523bc11f..e21b1024e87 100644
--- a/src/common/Utilities/StringFormat.h
+++ b/src/common/Utilities/StringFormat.h
@@ -19,7 +19,7 @@
#ifndef TRINITYCORE_STRING_FORMAT_H
#define TRINITYCORE_STRING_FORMAT_H
-#include "format.h"
+#include "cppformat/format.h"
namespace Trinity
{
diff --git a/src/server/bnetserver/CMakeLists.txt b/src/server/bnetserver/CMakeLists.txt
index 10b8e562143..3cc1d20cf5e 100644
--- a/src/server/bnetserver/CMakeLists.txt
+++ b/src/server/bnetserver/CMakeLists.txt
@@ -94,7 +94,7 @@ target_link_libraries(bnetserver
ipc
common
zmqpp
- format
+ cppformat
${MYSQL_LIBRARY}
${OPENSSL_LIBRARIES}
${ZMQ_LIBRARY}
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index af30600fc09..3d6a1cf3a78 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -151,7 +151,7 @@ target_link_libraries(worldserver
gsoap
Detour
zmqpp
- format
+ cppformat
${JEMALLOC_LIBRARY}
${READLINE_LIBRARY}
${TERMCAP_LIBRARY}
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 32fccaa2038..25ad7c771e8 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -30,7 +30,7 @@ add_executable(mapextractor
target_link_libraries(mapextractor
casc
common
- format
+ cppformat
${BZIP2_LIBRARIES}
${ZLIB_LIBRARIES}
${Boost_LIBRARIES}
diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt
index adc3410aa6e..5640ea8be5d 100644
--- a/src/tools/mmaps_generator/CMakeLists.txt
+++ b/src/tools/mmaps_generator/CMakeLists.txt
@@ -39,7 +39,7 @@ target_link_libraries(mmaps_generator
g3dlib
Recast
Detour
- format
+ cppformat
${BZIP2_LIBRARIES}
${ZLIB_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}