Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add utils-file and provide json-c
[src/app-framework-main.git]
/
src
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index
91a2cc1
..
f126346
100644
(file)
--- a/
src/CMakeLists.txt
+++ b/
src/CMakeLists.txt
@@
-1,5
+1,5
@@
###########################################################################
###########################################################################
-# Copyright 2015 IoT.bzh
+# Copyright 2015
, 2016, 2017
IoT.bzh
#
# author: José Bollo <jose.bollo@iot.bzh>
#
#
# author: José Bollo <jose.bollo@iot.bzh>
#
@@
-41,7
+41,7
@@
set(CMAKE_C_FLAGS_CCOV "-g -O2 --coverage")
include(FindPkgConfig)
include(FindPkgConfig)
-pkg_check_modules(EXTRAS REQUIRED libxml-2.0 openssl xmlsec1 xmlsec1-openssl)
+pkg_check_modules(EXTRAS REQUIRED libxml-2.0 openssl xmlsec1 xmlsec1-openssl
json-c
)
add_compile_options(${EXTRAS_CFLAGS})
include_directories(${EXTRAS_INCLUDE_DIRS})
link_libraries(${EXTRAS_LIBRARIES})
add_compile_options(${EXTRAS_CFLAGS})
include_directories(${EXTRAS_INCLUDE_DIRS})
link_libraries(${EXTRAS_LIBRARIES})
@@
-95,12
+95,15
@@
add_library(wgtpkg STATIC
add_library(utils STATIC
utils-dir.c
add_library(utils STATIC
utils-dir.c
+ utils-file.c
+ utils-json.c
verbose.c
)
add_library(wgt STATIC
wgt-config.c
wgt-info.c
verbose.c
)
add_library(wgt STATIC
wgt-config.c
wgt-info.c
+ wgt-strings.c
wgt.c
)
wgt.c
)
@@
-130,7
+133,7
@@
install(TARGETS wgtpkg-sign wgtpkg-pack wgtpkg-info wgtpkg-installer DESTINATION
###########################################################################
# the targeted
###########################################################################
# the targeted
-pkg_check_modules(EXTRA2
json-c
libsystemd)
+pkg_check_modules(EXTRA2 libsystemd)
if(EXTRA2_FOUND)
add_compile_options(${EXTRA2_CFLAGS})
include_directories(${EXTRA2_INCLUDE_DIRS})
if(EXTRA2_FOUND)
add_compile_options(${EXTRA2_CFLAGS})
include_directories(${EXTRA2_INCLUDE_DIRS})
@@
-138,7
+141,6
@@
if(EXTRA2_FOUND)
add_library(utils2 STATIC
utils-jbus.c
add_library(utils2 STATIC
utils-jbus.c
- utils-json.c
)
add_library(afm STATIC
)
add_library(afm STATIC