switch to cmake 3.4.3 at least

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f126346..b7c130a 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,7 +16,7 @@
 # limitations under the License.
 ###########################################################################
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.4.3)
 
 ###########################################################################
 
@@ -86,14 +86,17 @@ 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
@@ -104,6 +107,7 @@ add_library(wgt STATIC
        wgt-config.c
        wgt-info.c
        wgt-strings.c
+       wgt-json.c
        wgt.c
        )
 
@@ -133,11 +137,11 @@ install(TARGETS wgtpkg-sign wgtpkg-pack wgtpkg-info wgtpkg-installer DESTINATION
 ###########################################################################
 # the targeted
 
-pkg_check_modules(EXTRA2 libsystemd)
-if(EXTRA2_FOUND)
-       add_compile_options(${EXTRA2_CFLAGS})
-       include_directories(${EXTRA2_INCLUDE_DIRS})
-       link_libraries(${EXTRA2_LIBRARIES})
+pkg_check_modules(SYSTEMD libsystemd>=222)
+if(SYSTEMD_FOUND)
+       add_compile_options(${SYSTEMD_CFLAGS})
+       include_directories(${SYSTEMD_INCLUDE_DIRS})
+       link_libraries(${SYSTEMD_LIBRARIES})
 
        add_library(utils2 STATIC
                utils-jbus.c
@@ -165,20 +169,16 @@ if(EXTRA2_FOUND)
        ###########################################################################
        # the binding for afb
 
-       pkg_check_modules(afb afb-daemon)
-       if(afb_FOUND)
+       pkg_check_modules(AFB afb-daemon)
+       if(AFB_FOUND)
                message(STATUS "Creation afm-main-binding for AFB-DAEMON")
                ###############################################################
-               #pkg_get_variable(afb_binding_install_dir afb-daemon binding_install_dir)
-               execute_process(
-                       COMMAND pkg-config --variable binding_install_dir afb-daemon
-                       OUTPUT_VARIABLE afb_binding_install_dir OUTPUT_STRIP_TRAILING_WHITESPACE
-               )
+               pkg_get_variable(afb_binding_install_dir afb-daemon binding_install_dir)
                ###############################################################
                add_library(afm-main-binding MODULE afm-main-binding.c)
-               target_compile_options(afm-main-binding PRIVATE ${afb_CFLAGS})
-               target_include_directories(afm-main-binding PRIVATE ${afb_INCLUDE_DIRS})
-               target_link_libraries(afm-main-binding utils utils2 ${afb_LIBRARIES})
+               target_compile_options(afm-main-binding PRIVATE ${AFB_CFLAGS})
+               target_include_directories(afm-main-binding PRIVATE ${AFB_INCLUDE_DIRS})
+               target_link_libraries(afm-main-binding utils utils2 ${AFB_LIBRARIES})
                set_target_properties(afm-main-binding PROPERTIES
                        PREFIX ""
                        LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/afm-main-binding.export-map"
@@ -188,4 +188,10 @@ if(EXTRA2_FOUND)
                message(STATUS "Not creating the binding for AFB-DAEMON")
        endif()
 
-endif(EXTRA2_FOUND)
+endif(SYSTEMD_FOUND)
+
+###########################################################################
+# the tests
+
+add_subdirectory(tests)
+