X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=c38dd07e0408645104195fbd6e36bdd8a1a27ae1;hb=ee46ba35b65fe8cea2b1cd754e7c60bf71d3b8ab;hp=6b2b28065dcb24eef0a2da019130d8916de52024;hpb=c643fe4639e923b0a88e1a5d9df691418b540056;p=src%2Fapp-framework-main.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6b2b280..c38dd07 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,7 +41,7 @@ set(CMAKE_C_FLAGS_CCOV "-g -O2 --coverage") 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}) @@ -86,15 +86,20 @@ add_library(wgtpkg STATIC wgtpkg-digsig.c wgtpkg-files.c wgtpkg-install.c + wgtpkg-mustach.c wgtpkg-permissions.c wgtpkg-uninstall.c + wgtpkg-unit.c wgtpkg-workdir.c wgtpkg-xmlsec.c wgtpkg-zip.c ) add_library(utils STATIC + mustach.c utils-dir.c + utils-file.c + utils-json.c verbose.c ) @@ -102,6 +107,7 @@ add_library(wgt STATIC wgt-config.c wgt-info.c wgt-strings.c + wgt-json.c wgt.c ) @@ -131,7 +137,7 @@ install(TARGETS wgtpkg-sign wgtpkg-pack wgtpkg-info wgtpkg-installer DESTINATION ########################################################################### # 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}) @@ -139,7 +145,6 @@ if(EXTRA2_FOUND) add_library(utils2 STATIC utils-jbus.c - utils-json.c ) add_library(afm STATIC @@ -188,3 +193,9 @@ if(EXTRA2_FOUND) endif() endif(EXTRA2_FOUND) + +########################################################################### +# the tests + +add_subdirectory(tests) +