From e6634ed26c50e99f6ccd285235fe477cb4168b06 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Sat, 9 May 2020 15:51:15 +0100 Subject: Update submodules (#4727) Closes #4708 This updates jsoncpp, mbedtls, TCLAP and SQLiteCpp to their latest stable release. A few additional changes were needed: * jsoncpp deprecated Reader, FastWriter and StyledWriter which I've replaced with some helper functions in JsonUtils.cpp * SQLiteCpp changed how it builds with external sqlite libraries, now expecting them to be installed. The simplest path was to remove sqlite from cuberite's submodule and just use SQLiteCpp's internal version. --- tests/BlockTypeRegistry/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/BlockTypeRegistry/CMakeLists.txt') diff --git a/tests/BlockTypeRegistry/CMakeLists.txt b/tests/BlockTypeRegistry/CMakeLists.txt index 8118bc93c..1b2749722 100644 --- a/tests/BlockTypeRegistry/CMakeLists.txt +++ b/tests/BlockTypeRegistry/CMakeLists.txt @@ -26,11 +26,12 @@ add_executable(BlockTypePaletteTest ../TestHelpers.h ${CMAKE_SOURCE_DIR}/src/BlockState.cpp ${CMAKE_SOURCE_DIR}/src/BlockTypePalette.cpp + ${CMAKE_SOURCE_DIR}/src/JsonUtils.cpp ${CMAKE_SOURCE_DIR}/src/StringUtils.cpp ${CMAKE_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp ${CMAKE_SOURCE_DIR}/src/OSSupport/File.cpp ) -target_link_libraries(BlockTypePaletteTest fmt::fmt jsoncpp_lib_static) +target_link_libraries(BlockTypePaletteTest fmt::fmt jsoncpp_lib) # BlockTypeRegistryTest: Verify that the BlockTypeRegistry class works as intended: add_executable(BlockTypeRegistryTest @@ -50,11 +51,12 @@ add_executable(PalettedBlockAreaTest ${CMAKE_SOURCE_DIR}/src/BlockTypeRegistry.cpp ${CMAKE_SOURCE_DIR}/src/BlockTypePalette.cpp ${CMAKE_SOURCE_DIR}/src/Cuboid.cpp + ${CMAKE_SOURCE_DIR}/src/JsonUtils.cpp ${CMAKE_SOURCE_DIR}/src/PalettedBlockArea.cpp ${CMAKE_SOURCE_DIR}/src/StringUtils.cpp ${CMAKE_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp ) -target_link_libraries(PalettedBlockAreaTest fmt::fmt jsoncpp_lib_static) +target_link_libraries(PalettedBlockAreaTest fmt::fmt jsoncpp_lib) # Extra files for BlockTypePalette test: file (COPY -- cgit v1.2.3