aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2017-03-13 14:05:20 +0100
committerJosé Bollo <jose.bollo@iot.bzh>2017-03-14 10:21:05 +0100
commit276d6124ee3dfc8802e9a0fb4fc7b1e2034dfb24 (patch)
treefcee1379722f8319c8dd212a278c91b4c4bd4cb3
parentd6d9ef2d710c266b1b6247875a4f69d2ecac4018 (diff)
improve names in CMakeLists
Change-Id: If86544db50c5813868550338a68c0e11ea469a35 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
-rw-r--r--src/CMakeLists.txt22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c38dd07..5e321ea 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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,8 +169,8 @@ 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)
@@ -180,9 +180,9 @@ if(EXTRA2_FOUND)
)
###############################################################
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 +192,7 @@ if(EXTRA2_FOUND)
message(STATUS "Not creating the binding for AFB-DAEMON")
endif()
-endif(EXTRA2_FOUND)
+endif(SYSTEMD_FOUND)
###########################################################################
# the tests