Update the minimodules

cuberite · Apr 12, 2021 · 04cb499 · 04cb499
1 parent 8d10f1b
commit 04cb499
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/lib/jsoncpp b/lib/jsoncpp
diff --git a/lib/lua b/lib/lua
diff --git 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
@@ -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
@@ -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})