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
Try to improves the error message after exec
[src/app-framework-main.git]
/
src
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index
991b5b8
..
c38dd07
100644
(file)
--- a/
src/CMakeLists.txt
+++ b/
src/CMakeLists.txt
@@
-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})
@@
-86,21
+86,28
@@
add_library(wgtpkg STATIC
wgtpkg-digsig.c
wgtpkg-files.c
wgtpkg-install.c
wgtpkg-digsig.c
wgtpkg-files.c
wgtpkg-install.c
+ wgtpkg-mustach.c
wgtpkg-permissions.c
wgtpkg-uninstall.c
wgtpkg-permissions.c
wgtpkg-uninstall.c
+ wgtpkg-unit.c
wgtpkg-workdir.c
wgtpkg-xmlsec.c
wgtpkg-zip.c
)
add_library(utils STATIC
wgtpkg-workdir.c
wgtpkg-xmlsec.c
wgtpkg-zip.c
)
add_library(utils STATIC
+ mustach.c
utils-dir.c
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-json.c
wgt.c
)
wgt.c
)
@@
-130,7
+137,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
+145,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
@@
-187,3
+193,9
@@
if(EXTRA2_FOUND)
endif()
endif(EXTRA2_FOUND)
endif()
endif(EXTRA2_FOUND)
+
+###########################################################################
+# the tests
+
+add_subdirectory(tests)
+