blob: 32e233836232fb53e93679636c25f39eaed8d791 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
Index: 3rdpart/CMakeLists.txt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/3rdpart/CMakeLists.txt b/3rdpart/CMakeLists.txt
--- a/3rdpart/CMakeLists.txt (revision af3ef996b0ae265e000344e7faf753577f9abf4e)
+++ b/3rdpart/CMakeLists.txt (date 1711782947005)
@@ -24,6 +24,7 @@
##############################################################################
# jsoncpp
+if (0)
file(GLOB JSONCPP_SRC_LIST
${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp/include/json/*.h
${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp/src/lib_json/*.cpp
@@ -38,7 +39,8 @@
PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/jsoncpp/include")
-update_cached_list(MK_LINK_LIBRARIES jsoncpp)
+endif()
+update_cached_list(MK_LINK_LIBRARIES JsonCpp::JsonCpp)
##############################################################################
Index: CMakeLists.txt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt (revision af3ef996b0ae265e000344e7faf753577f9abf4e)
+++ b/CMakeLists.txt (date 1711782947012)
@@ -479,6 +479,7 @@
# for assert.h
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpart)
+find_package(jsoncpp CONFIG REQUIRED)
add_subdirectory(3rdpart)
add_subdirectory(src)
|
