13 files changed, 27 insertions, 9 deletions

diff --git a/tests/BoundingBox/CMakeLists.txt b/tests/BoundingBox/CMakeLists.txt
index 3de6b5ade..da960ba19 100644
--- a/tests/BoundingBox/CMakeLists.txt
+++ b/tests/BoundingBox/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.0.2)
 enable_testing()
 add_definitions(-DTEST_GLOBALS=1)
 
@@ -25,6 +26,7 @@ set (SRCS
 source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS})
 source_group("Sources" FILES ${SRCS})
 add_executable(BoundingBox-exe ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS})
+target_link_libraries(BoundingBox-exe fmt::fmt)
 add_test(NAME BoundingBox-test COMMAND BoundingBox-exe)
 
 
diff --git a/tests/ByteBuffer/CMakeLists.txt b/tests/ByteBuffer/CMakeLists.txt
index 06832848e..aa053e80f 100644
--- a/tests/ByteBuffer/CMakeLists.txt
+++ b/tests/ByteBuffer/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.0.2)
 enable_testing()
 add_definitions(-DTEST_GLOBALS=1)
 
@@ -25,6 +26,7 @@ set (SRCS
 source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS})
 source_group("Sources" FILES ${SRCS})
 add_executable(ByteBuffer-exe ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS})
+target_link_libraries(ByteBuffer-exe fmt::fmt)
 if (WIN32)
 	target_link_libraries(ByteBuffer-exe ws2_32)
 endif()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index eba4bc4c8..20ae1bfa3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,6 +4,8 @@ if (CMAKE_BUILD_TYPE STREQUAL "COVERAGE")
 	setup_target_for_coverage("${PROJECT_NAME}_coverage" "ctest" coverage)
 endif()
 
+add_definitions(-DTEST_GLOBALS=1)
+
 add_subdirectory(BoundingBox)
 add_subdirectory(ByteBuffer)
 add_subdirectory(ChunkData)
diff --git a/tests/ChunkData/CMakeLists.txt b/tests/ChunkData/CMakeLists.txt
index 61cb8e7c6..5bd617f6c 100644
--- a/tests/ChunkData/CMakeLists.txt
+++ b/tests/ChunkData/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.0.2)
 enable_testing()
 
 include_directories(${CMAKE_SOURCE_DIR}/src/)
@@ -6,6 +7,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/)
 add_definitions(-DTEST_GLOBALS=1)
 add_library(ChunkBuffer ${CMAKE_SOURCE_DIR}/src/ChunkData.cpp ${CMAKE_SOURCE_DIR}/src/StringUtils.cpp)
 
+target_link_libraries(ChunkBuffer PUBLIC fmt::fmt)
 
 add_executable(creatable-exe creatable.cpp)
 target_link_libraries(creatable-exe ChunkBuffer)
diff --git a/tests/CompositeChat/CMakeLists.txt b/tests/CompositeChat/CMakeLists.txt
index c168ebfd3..52eeedbe9 100644
--- a/tests/CompositeChat/CMakeLists.txt
+++ b/tests/CompositeChat/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.0.2)
 enable_testing()
 add_definitions(-DTEST_GLOBALS=1)
 
@@ -28,7 +29,7 @@ set (SRCS
 source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS})
 source_group("Sources" FILES ${SRCS})
 add_executable(CompositeChat-exe ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS})
-target_link_libraries(CompositeChat-exe jsoncpp_lib_static)
+target_link_libraries(CompositeChat-exe jsoncpp_lib_static fmt::fmt)
 add_test(NAME CompositeChat-test COMMAND CompositeChat-exe)
 
 
diff --git a/tests/FastRandom/CMakeLists.txt b/tests/FastRandom/CMakeLists.txt
index df7492c5f..bd51f90c8 100644
--- a/tests/FastRandom/CMakeLists.txt
+++ b/tests/FastRandom/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.0.2)
 enable_testing()
 add_definitions(-DTEST_GLOBALS=1)
 
@@ -25,6 +26,7 @@ set (SRCS
 source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS})
 source_group("Sources" FILES ${SRCS})
 add_executable(FastRandom-exe ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS})
+target_link_libraries(FastRandom-exe fmt::fmt)
 if (WIN32)
 	target_link_libraries(FastRandom-exe ws2_32)
 endif()
diff --git a/tests/Generating/CMakeLists.txt b/tests/Generating/CMakeLists.txt
index 979fa4f0e..31cfc5c24 100644
--- a/tests/Generating/CMakeLists.txt
+++ b/tests/Generating/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.0.2)
 enable_testing()
 
 include_directories(${CMAKE_SOURCE_DIR}/src/)
@@ -83,7 +84,7 @@ endif()
 
 
 add_library(GeneratorTestingSupport STATIC ${SHARED_SRCS} ${SHARED_HDRS} ${STUBS})
-target_link_libraries(GeneratorTestingSupport tolualib zlib)
+target_link_libraries(GeneratorTestingSupport tolualib zlib fmt::fmt)
 source_group("Stubs" FILES ${STUBS})
 
 
diff --git a/tests/HTTP/CMakeLists.txt b/tests/HTTP/CMakeLists.txt
index 55074958e..3f0f4b6f8 100644
--- a/tests/HTTP/CMakeLists.txt
+++ b/tests/HTTP/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.0.2)
 enable_testing()
 
 include_directories(${CMAKE_SOURCE_DIR}/src/)
@@ -57,11 +58,11 @@ source_group("Data Files" FILES ${TEST_DATA_FILES})
 
 # HTTPMessageParser_file: Feed file contents into a cHTTPResponseParser and print the callbacks as they're called:
 add_executable(HTTPMessageParser_file-exe HTTPMessageParser_file.cpp ${TEST_DATA_FILES})
-target_link_libraries(HTTPMessageParser_file-exe HTTP Network OSSupport)
+target_link_libraries(HTTPMessageParser_file-exe HTTP Network OSSupport fmt::fmt)
 
 # UrlClientTest: Tests the UrlClient class by requesting a few things off the internet:
 add_executable(UrlClientTest-exe UrlClientTest.cpp)
-target_link_libraries(UrlClientTest-exe HTTP)
+target_link_libraries(UrlClientTest-exe HTTP fmt::fmt)
 
 
 
diff --git a/tests/LuaThreadStress/CMakeLists.txt b/tests/LuaThreadStress/CMakeLists.txt
index 25b245775..2f005a342 100644
--- a/tests/LuaThreadStress/CMakeLists.txt
+++ b/tests/LuaThreadStress/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.0.2)
 enable_testing()
 
 include_directories(${CMAKE_SOURCE_DIR}/src/)
@@ -81,7 +82,7 @@ source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS})
 source_group("Sources" FILES ${SRCS})
 source_group("Lua files" FILES Test.lua)
 add_executable(LuaThreadStress ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS} Test.lua)
-target_link_libraries(LuaThreadStress tolualib zlib)
+target_link_libraries(LuaThreadStress tolualib zlib fmt::fmt)
 add_test(NAME LuaThreadStress-test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND LuaThreadStress)
 
 
diff --git a/tests/Network/CMakeLists.txt b/tests/Network/CMakeLists.txt
index aa8c24c4e..91091b5cf 100644
--- a/tests/Network/CMakeLists.txt
+++ b/tests/Network/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.0.2)
 enable_testing()
 
 include_directories(${CMAKE_SOURCE_DIR}/src/)
@@ -54,7 +55,7 @@ add_library(Network
 	${Network_HDRS}
 )
 
-target_link_libraries(Network event_core event_extra mbedtls)
+target_link_libraries(Network event_core event_extra fmt::fmt mbedtls)
 if (MSVC)
 	target_link_libraries(Network ws2_32.lib)
 endif()
diff --git a/tests/OSSupport/CMakeLists.txt b/tests/OSSupport/CMakeLists.txt
index 1d487d82c..938538f14 100644
--- a/tests/OSSupport/CMakeLists.txt
+++ b/tests/OSSupport/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.0.2)
 enable_testing()
 
 include_directories(${CMAKE_SOURCE_DIR}/src/)
@@ -28,7 +29,7 @@ endif()
 
 # StressEvent: Stress-test the cEvent implementation:
 add_executable(StressEvent-exe StressEvent.cpp)
-target_link_libraries(StressEvent-exe OSSupport)
+target_link_libraries(StressEvent-exe OSSupport fmt::fmt)
 add_test(NAME StressEvent-test COMMAND StressEvent-exe)
 
 
diff --git a/tests/SchematicFileSerializer/CMakeLists.txt b/tests/SchematicFileSerializer/CMakeLists.txt
index 1f3bcfc89..a431bee8e 100644
--- a/tests/SchematicFileSerializer/CMakeLists.txt
+++ b/tests/SchematicFileSerializer/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.0.2)
 enable_testing()
 
 include_directories(${CMAKE_SOURCE_DIR}/src/)
@@ -73,7 +74,7 @@ endif()
 source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS})
 source_group("Sources" FILES ${SRCS})
 add_executable(SchematicFileSerializer-exe ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS})
-target_link_libraries(SchematicFileSerializer-exe zlib)
+target_link_libraries(SchematicFileSerializer-exe zlib fmt::fmt)
 add_test(NAME SchematicFileSerializer-test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND SchematicFileSerializer-exe)
 
 
diff --git a/tests/UUID/CMakeLists.txt b/tests/UUID/CMakeLists.txt
index 72746d10d..384ebe1e5 100644
--- a/tests/UUID/CMakeLists.txt
+++ b/tests/UUID/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.0.2)
 enable_testing()
 
 set (SHARED_SRCS
@@ -18,7 +19,7 @@ source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS})
 source_group("Sources" FILES ${SRCS})
 
 add_executable(UUIDTest ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS})
-target_link_libraries(UUIDTest mbedcrypto)
+target_link_libraries(UUIDTest mbedcrypto fmt::fmt)
 target_compile_definitions(UUIDTest PRIVATE TEST_GLOBALS=1)
 target_include_directories(UUIDTest PRIVATE
 	${CMAKE_SOURCE_DIR}/src/