diff options
author | peterbell10 <peterbell10@live.co.uk> | 2020-05-09 16:51:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-09 16:51:15 +0200 |
commit | e6634ed26c50e99f6ccd285235fe477cb4168b06 (patch) | |
tree | b533a69db545835a886bcd8c5b05609b4c830d11 /tests | |
parent | Upgrade to C++17 [CI] (#4716) (diff) | |
download | cuberite-e6634ed26c50e99f6ccd285235fe477cb4168b06.tar cuberite-e6634ed26c50e99f6ccd285235fe477cb4168b06.tar.gz cuberite-e6634ed26c50e99f6ccd285235fe477cb4168b06.tar.bz2 cuberite-e6634ed26c50e99f6ccd285235fe477cb4168b06.tar.lz cuberite-e6634ed26c50e99f6ccd285235fe477cb4168b06.tar.xz cuberite-e6634ed26c50e99f6ccd285235fe477cb4168b06.tar.zst cuberite-e6634ed26c50e99f6ccd285235fe477cb4168b06.zip |
Diffstat (limited to 'tests')
-rw-r--r-- | tests/BlockTypeRegistry/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tests/CompositeChat/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/Generating/CMakeLists.txt | 2 |
3 files changed, 8 insertions, 4 deletions
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 diff --git a/tests/CompositeChat/CMakeLists.txt b/tests/CompositeChat/CMakeLists.txt index 03a100d91..626a146f8 100644 --- a/tests/CompositeChat/CMakeLists.txt +++ b/tests/CompositeChat/CMakeLists.txt @@ -10,12 +10,14 @@ add_definitions(-DTEST_GLOBALS=1) set (SHARED_SRCS ${CMAKE_SOURCE_DIR}/src/CompositeChat.cpp + ${CMAKE_SOURCE_DIR}/src/JsonUtils.cpp ${CMAKE_SOURCE_DIR}/src/StringUtils.cpp ) set (SHARED_HDRS ../TestHelpers.h ${CMAKE_SOURCE_DIR}/src/CompositeChat.h + ${CMAKE_SOURCE_DIR}/src/JsonUtils.h ${CMAKE_SOURCE_DIR}/src/StringUtils.h ) @@ -28,7 +30,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 fmt::fmt) +target_link_libraries(CompositeChat-exe jsoncpp_lib fmt::fmt) add_test(NAME CompositeChat-test COMMAND CompositeChat-exe) diff --git a/tests/Generating/CMakeLists.txt b/tests/Generating/CMakeLists.txt index cf8e2faa0..b7ce70e13 100644 --- a/tests/Generating/CMakeLists.txt +++ b/tests/Generating/CMakeLists.txt @@ -161,7 +161,7 @@ add_library(GeneratorTestingSupport STATIC ${GENERATING_HDRS} ${STUBS} ) -target_link_libraries(GeneratorTestingSupport tolualib zlib fmt::fmt jsoncpp_lib_static) +target_link_libraries(GeneratorTestingSupport tolualib zlib fmt::fmt jsoncpp_lib) source_group("Stubs" FILES ${STUBS}) source_group("Generating" FILES ${GENERATING_HDRS} ${GENERATING_SRCS}) |