blob: 91422c62dbe57d4a3cfc63aac80d48aa03a01da6 (
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
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
From 59c9388e3800b9e07fd387dbdc3e26b7242ed6ea Mon Sep 17 00:00:00 2001
From: Scott Ware <scott.r.ware@intel.com>
Date: Fri, 17 Apr 2020 17:52:08 +0100
Subject: [PATCH 2/2] Use provided parson lib
Signed-off-by: Scott Ware <scott.r.ware@intel.com>
---
CMakeLists.txt | 26 --------------------------
dependencies.cmake | 3 +++
2 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e92da5c..04e185a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,17 +177,6 @@ endif()
# Use solution folders.
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-# build the parson library for json parsing
-add_library(parson
- ./deps/parson/parson.c
- ./deps/parson/parson.h
-)
-if (MSVC)
- set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232")
-endif()
-set(parson_h_install_files ./deps/parson/parson.h)
-set(parson_install_libs parson)
-
if (IN_OPENWRT)
ADD_DEFINITIONS("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}")
INCLUDE_DIRECTORIES("$ENV{TOOLCHAIN_DIR}/usr/include" "$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}")
@@ -419,15 +408,6 @@ if (${use_installed_dependencies})
COPYONLY
)
- install(FILES ${parson_h_install_files}
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot
- )
- install(TARGETS ${parson_install_libs} EXPORT azure_iot_sdksTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot
- )
-
install(EXPORT azure_iot_sdksTargets
FILE
"${PROJECT_NAME}Targets.cmake"
@@ -443,11 +423,5 @@ if (${use_installed_dependencies})
DESTINATION
${package_location}
)
-else()
- install(FILES ${parson_h_install_files}
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot)
- install(TARGETS ${parson_install_libs}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
diff --git a/dependencies.cmake b/dependencies.cmake
index fd06df6..22ba6af 100644
--- a/dependencies.cmake
+++ b/dependencies.cmake
@@ -18,6 +18,9 @@ if(${use_installed_dependencies})
endif ()
endif ()
+ if (NOT parson_FOUND)
+ find_package(parson REQUIRED CONFIG)
+ endif ()
else ()
add_subdirectory(c-utility)
--
2.7.4
|
