Adding uninstallation of widgets

[src/app-framework-main.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 499d38a..0b055e8 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,7 +21,6 @@ cmake_minimum_required(VERSION 2.8)
 include(FindPkgConfig)
 
 pkg_check_modules(EXTRAS REQUIRED
-       libzip>=0.11
        libxml-2.0
        openssl
        xmlsec1 xmlsec1-openssl
@@ -33,13 +32,31 @@ add_compile_options(${EXTRAS_CFLAGS})
 include_directories(${EXTRAS_INCLUDE_DIRS})
 link_libraries(${EXTRAS_LIBRARIES})
 
+if(USE_LIBZIP)
+       pkg_check_modules(LIBZIP REQUIRED libzip>=0.11)
+       add_compile_options(${LIBZIP_CFLAGS})
+       include_directories(${LIBZIP_INCLUDE_DIRS})
+       link_libraries(${LIBZIP_LIBRARIES})
+       add_definitions(-DUSE_LIBZIP=1)
+else(USE_LIBZIP)
+       add_definitions(-DUSE_LIBZIP=0)
+endif(USE_LIBZIP)
+
 ###########################################################################
 
-include_directories(simulation)
+if(USE_SIMULATION)
+       include_directories(simulation)
+else(USE_SIMULATION)
+       pkg_check_modules(SECMGR REQUIRED security-manager)
+       add_compile_options(${SECMGR_CFLAGS})
+       include_directories(${SECMGR_INCLUDE_DIRS})
+       link_libraries(${SECMGR_LIBRARIES})
+endif(USE_SIMULATION)
 
 ###########################################################################
 
 add_compile_options(-Wall -Wno-pointer-sign)
+add_compile_options(-Werror=maybe-uninitialized -Werror=implicit-function-declaration)
 add_compile_options(-ffunction-sections -fdata-sections)
 add_compile_options(-fPIC)
 add_compile_options(-Wl,--gc-sections)
@@ -58,6 +75,7 @@ add_library(wgtpkg
        wgtpkg-files.c
        wgtpkg-install.c
        wgtpkg-permissions.c
+       wgtpkg-uninstall.c
        wgtpkg-workdir.c
        wgtpkg-xmlsec.c
        wgtpkg-zip.c
@@ -66,6 +84,7 @@ add_library(wgtpkg
 add_library(utils
        utils-dir.c
        utils-jbus.c
+       utils-json.c
        verbose.c
        )