summaryrefslogtreecommitdiffstats
path: root/CMake
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2021-04-12 01:25:51 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2021-04-12 15:09:18 +0200
commit04cb4996e22c1d95c1c839b6fb54d49272d5bbc0 (patch)
tree32a06345887b027e358c14fd56f346857282ef39 /CMake
parentfixed build (#5181) (diff)
downloadcuberite-04cb4996e22c1d95c1c839b6fb54d49272d5bbc0.tar
cuberite-04cb4996e22c1d95c1c839b6fb54d49272d5bbc0.tar.gz
cuberite-04cb4996e22c1d95c1c839b6fb54d49272d5bbc0.tar.bz2
cuberite-04cb4996e22c1d95c1c839b6fb54d49272d5bbc0.tar.lz
cuberite-04cb4996e22c1d95c1c839b6fb54d49272d5bbc0.tar.xz
cuberite-04cb4996e22c1d95c1c839b6fb54d49272d5bbc0.tar.zst
cuberite-04cb4996e22c1d95c1c839b6fb54d49272d5bbc0.zip
Diffstat (limited to '')
-rw-r--r--CMake/AddDependencies.cmake9
-rw-r--r--CMake/GroupSources.cmake2
2 files changed, 7 insertions, 4 deletions
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