cmake: improves error detection

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 89d4d51..8971edb 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,21 +39,30 @@ if(USE_LIBZIP)
        link_libraries(${LIBZIP_LIBRARIES})
        add_definitions(-DUSE_LIBZIP=1)
 else(USE_LIBZIP)
-       find_program(PATH_TO_ZIP zip)
-       find_program(PATH_TO_UNZIP unzip)
-       add_definitions(-DUSE_LIBZIP=0 -DPATH_TO_ZIP="${PATH_TO_ZIP}" -DPATH_TO_UNZIP="${PATH_TO_UNZIP}")
+       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(-Wall -Wextra -Wconversion)
+add_compile_options(-Wno-unused-parameter) # frankly not using a parameter does it care?
+add_compile_options(-Werror=maybe-uninitialized)
+add_compile_options(-Werror=implicit-function-declaration)
+add_compile_options(-Wno-pointer-sign) # for XmlChar handling
 add_compile_options(-ffunction-sections -fdata-sections)
-add_compile_options(-fPIC)
 add_compile_options(-Wl,--gc-sections)
+add_compile_options(-fPIC)
 
 set(CMAKE_C_FLAGS_PROFILING    "-g -O0 -pg -Wp,-U_FORTIFY_SOURCE")
 set(CMAKE_C_FLAGS_DEBUG        "-g -O0 -ggdb -Wp,-U_FORTIFY_SOURCE")
@@ -69,6 +78,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
@@ -77,6 +87,7 @@ add_library(wgtpkg
 add_library(utils
        utils-dir.c
        utils-jbus.c
+       utils-json.c
        verbose.c
        )
 
@@ -93,6 +104,7 @@ add_library(secwrp
 add_library(afm
        afm-db.c
        afm-launch.c
+       afm-launch-mode.c
        afm-run.c
        )