diff options
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | CMake/AddDependencies.cmake | 9 | ||||
| -rw-r--r-- | CMake/GroupSources.cmake | 2 | ||||
| m--------- | lib/fmt | 0 | ||||
| m--------- | lib/jsoncpp | 0 | ||||
| m--------- | lib/lua | 0 | ||||
| -rw-r--r-- | tests/BlockTypeRegistry/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/CompositeChat/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/Generating/CMakeLists.txt | 2 |
9 files changed, 12 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules index 9849b32df..73bae7338 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,7 +21,7 @@ ignore = dirty [submodule "lib/jsoncpp"] path = lib/jsoncpp - url = https://github.com/cuberite/jsoncpp.git + url = https://github.com/open-source-parsers/jsoncpp.git ignore = dirty [submodule "lib/TCLAP"] path = lib/TCLAP diff --git a/CMake/AddDependencies.cmake b/CMake/AddDependencies.cmake index a7539c593..e9f24db09 100644 --- a/CMake/AddDependencies.cmake +++ b/CMake/AddDependencies.cmake @@ -20,6 +20,9 @@ function(build_dependencies) set(JSONCPP_WITH_TESTS OFF CACHE BOOL "Compile and (for jsoncpp_check) run JsonCpp test executables") set(JSONCPP_WITH_POST_BUILD_UNITTEST OFF CACHE BOOL "Automatically run unit-tests as a post build step") set(JSONCPP_WITH_PKGCONFIG_SUPPORT OFF CACHE BOOL "Generate and install .pc files") + set(JSONCPP_WITH_CMAKE_PACKAGE OFF CACHE BOOL "Generate and install cmake package files") + set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build jsoncpp_lib as a shared library.") + set(BUILD_OBJECT_LIBS OFF CACHE BOOL "Build jsoncpp_lib as a object library.") # Set options for mbedtls: set(ENABLE_PROGRAMS OFF CACHE BOOL "Build mbed TLS programs.") @@ -60,7 +63,7 @@ function(link_dependencies TARGET) event_core event_extra fmt::fmt - jsoncpp_lib + jsoncpp_static libdeflate lsqlite lualib @@ -80,6 +83,6 @@ function(link_dependencies TARGET) target_link_libraries(${TARGET} PRIVATE event_pthreads) endif() - # Prettify jsoncpp_lib name in VS solution explorer: - set_property(TARGET jsoncpp_lib PROPERTY PROJECT_LABEL "jsoncpp") + # Prettify jsoncpp_static name in VS solution explorer: + set_property(TARGET jsoncpp_static PROPERTY PROJECT_LABEL "jsoncpp") endfunction() diff --git a/CMake/GroupSources.cmake b/CMake/GroupSources.cmake index 59bd8c5c0..875c4673e 100644 --- a/CMake/GroupSources.cmake +++ b/CMake/GroupSources.cmake @@ -8,7 +8,7 @@ function(group_sources) event_extra_static expat fmt - jsoncpp_lib + jsoncpp_static libdeflate lualib luaexpat diff --git a/lib/fmt b/lib/fmt -Subproject 5173a76ba49936d252a85ee49b7eb96e3dff403 +Subproject 7bdf0628b1276379886c7f6dda2cef2b3b374f0 diff --git a/lib/jsoncpp b/lib/jsoncpp -Subproject b8cb8889aab726a35c49472228256f7bb1d4438 +Subproject 9059f5cad030ba11d37818847443a53918c327b diff --git a/lib/lua b/lib/lua -Subproject 9972ba6d45f572b3569f907421fbc4866b4d1bf +Subproject 935fe9113295e049baa8ab0163e2dfec0393a8d diff --git a/tests/BlockTypeRegistry/CMakeLists.txt b/tests/BlockTypeRegistry/CMakeLists.txt index e81d5ff38..c4f3873d0 100644 --- a/tests/BlockTypeRegistry/CMakeLists.txt +++ b/tests/BlockTypeRegistry/CMakeLists.txt @@ -23,7 +23,7 @@ add_executable(BlockTypePaletteTest ${PROJECT_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp ${PROJECT_SOURCE_DIR}/src/OSSupport/File.cpp ) -target_link_libraries(BlockTypePaletteTest fmt::fmt jsoncpp_lib) +target_link_libraries(BlockTypePaletteTest fmt::fmt jsoncpp_static) # BlockTypeRegistryTest: Verify that the BlockTypeRegistry class works as intended: add_executable(BlockTypeRegistryTest @@ -48,7 +48,7 @@ add_executable(PalettedBlockAreaTest ${PROJECT_SOURCE_DIR}/src/StringUtils.cpp ${PROJECT_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp ) -target_link_libraries(PalettedBlockAreaTest fmt::fmt jsoncpp_lib) +target_link_libraries(PalettedBlockAreaTest fmt::fmt jsoncpp_static) # Extra files for BlockTypePalette test: file (COPY diff --git a/tests/CompositeChat/CMakeLists.txt b/tests/CompositeChat/CMakeLists.txt index 7bb65cfe7..a93ff9998 100644 --- a/tests/CompositeChat/CMakeLists.txt +++ b/tests/CompositeChat/CMakeLists.txt @@ -24,7 +24,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 fmt::fmt) +target_link_libraries(CompositeChat-exe jsoncpp_static fmt::fmt) add_test(NAME CompositeChat-test COMMAND CompositeChat-exe) diff --git a/tests/Generating/CMakeLists.txt b/tests/Generating/CMakeLists.txt index 73352d34b..92307235f 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 fmt::fmt jsoncpp_lib tolualib libdeflate) +target_link_libraries(GeneratorTestingSupport fmt::fmt jsoncpp_static tolualib libdeflate) source_group("Stubs" FILES ${STUBS}) source_group("Generating" FILES ${GENERATING_HDRS} ${GENERATING_SRCS}) |