1
0
Fork 0

Update the minimodules

master
Tiger Wang 2 years ago
parent 8d10f1b26a
commit 04cb4996e2
  1. 2
      .gitmodules
  2. 9
      CMake/AddDependencies.cmake
  3. 2
      CMake/GroupSources.cmake
  4. 2
      lib/fmt
  5. 2
      lib/jsoncpp
  6. 2
      lib/lua
  7. 4
      tests/BlockTypeRegistry/CMakeLists.txt
  8. 2
      tests/CompositeChat/CMakeLists.txt
  9. 2
      tests/Generating/CMakeLists.txt

2
.gitmodules vendored

@ -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

@ -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()

@ -8,7 +8,7 @@ function(group_sources)
event_extra_static
expat
fmt
jsoncpp_lib
jsoncpp_static
libdeflate
lualib
luaexpat

@ -1 +1 @@
Subproject commit 5173a76ba49936d252a85ee49b7eb96e3dff4033
Subproject commit 7bdf0628b1276379886c7f6dda2cef2b3b374f0b

@ -1 +1 @@
Subproject commit b8cb8889aab726a35c49472228256f7bb1d44388
Subproject commit 9059f5cad030ba11d37818847443a53918c327b1

@ -1 +1 @@
Subproject commit 9972ba6d45f572b3569f907421fbc4866b4d1bfb
Subproject commit 935fe9113295e049baa8ab0163e2dfec0393a8dd

@ -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

@ -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)

@ -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})

Loading…
Cancel
Save