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
|
From: =?utf-8?q?Timo_R=C3=B6hling?= <timo@gaussglocke.de>
Date: Thu, 3 Dec 2020 11:50:49 +0100
Subject: Use system nlohmann_json
Forwarded: not-needed
---
CMakeLists.txt | 2 +-
src/cpp/CMakeLists.txt | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9769a7..6939696 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -269,7 +269,7 @@ if(ANDROID)
endif()
endif()
-include_directories(thirdparty/nlohmann-json)
+find_package(nlohmann_json REQUIRED)
include_directories(thirdparty/filewatch)
###############################################################################
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
index f546693..a2a5c2f 100644
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
@@ -515,6 +515,7 @@ target_link_libraries(${PROJECT_NAME}
PRIVATE
eProsima_atomic
+ nlohmann_json::nlohmann_json
)
if (APPLE)
|
