58 lines
1.5 KiB
Diff
58 lines
1.5 KiB
Diff
|
From ea6901c9ed0f804bd2d6d09e514610518c2f4f09 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lorenz Brun <lorenz@brun.one>
|
||
|
|
Date: Fri, 18 Mar 2022 17:36:22 +0100
|
||
|
|
Subject: [PATCH] Use normal jsoncpp
|
||
|
|
|
||
|
|
---
|
||
|
|
src/CMakeLists.txt | 6 +++---
|
||
|
|
tester/CMakeLists.txt | 2 +-
|
||
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||
|
|
index 5cd87fe9a..822b2151e 100644
|
||
|
|
--- a/src/CMakeLists.txt
|
||
|
|
+++ b/src/CMakeLists.txt
|
||
|
|
@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI)
|
||
|
|
if (XCODE)
|
||
|
|
list(APPEND LINK_LIBS jsoncpp_static)
|
||
|
|
else()
|
||
|
|
- list(APPEND LINK_LIBS jsoncpp_object)
|
||
|
|
+ list(APPEND LINK_LIBS jsoncpp)
|
||
|
|
endif()
|
||
|
|
endif()
|
||
|
|
|
||
|
|
@@ -592,7 +592,7 @@ if(ENABLE_STATIC)
|
||
|
|
if (XCODE)
|
||
|
|
target_link_libraries(linphone PRIVATE jsoncpp_static)
|
||
|
|
else()
|
||
|
|
- target_link_libraries(linphone PRIVATE jsoncpp_object)
|
||
|
|
+ target_link_libraries(linphone PRIVATE jsoncpp)
|
||
|
|
endif()
|
||
|
|
endif()
|
||
|
|
|
||
|
|
@@ -646,7 +646,7 @@ if(ENABLE_SHARED)
|
||
|
|
if (XCODE)
|
||
|
|
target_link_libraries(linphone PRIVATE jsoncpp_static)
|
||
|
|
else()
|
||
|
|
- target_link_libraries(linphone PRIVATE jsoncpp_object)
|
||
|
|
+ target_link_libraries(linphone PRIVATE jsoncpp)
|
||
|
|
endif()
|
||
|
|
endif()
|
||
|
|
|
||
|
|
diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
|
||
|
|
index b97042678..b4c5a5794 100644
|
||
|
|
--- a/tester/CMakeLists.txt
|
||
|
|
+++ b/tester/CMakeLists.txt
|
||
|
|
@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI)
|
||
|
|
if (XCODE)
|
||
|
|
list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_static)
|
||
|
|
else()
|
||
|
|
- list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_object)
|
||
|
|
+ list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp)
|
||
|
|
endif()
|
||
|
|
endif()
|
||
|
|
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|