X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=b7c130a79d7592139946f2a321b0fd9080ad9d2c;hb=ea587a2162338cc221ecdc7bbe56341d51a777c8;hp=c38dd07e0408645104195fbd6e36bdd8a1a27ae1;hpb=1d4de11a907e41c06063a2cd5028dc4101690f50;p=src%2Fapp-framework-main.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c38dd07..b7c130a 100644 --- 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) ########################################################################### @@ -137,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 @@ -169,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" @@ -192,7 +188,7 @@ if(EXTRA2_FOUND) message(STATUS "Not creating the binding for AFB-DAEMON") endif() -endif(EXTRA2_FOUND) +endif(SYSTEMD_FOUND) ########################################################################### # the tests