diff options
| author |   Manuel Bachmann <manuel.bachmann@iot.bzh> | 2015-12-22 17:01:59 +0100 |
|---|---|---|
| committer | Manuel Bachmann <manuel.bachmann@iot.bzh> | 2015-12-22 17:01:59 +0100 |
| commit | 17ab342ea54c080a9fcf5f5a9b139e22de3e00dd (patch) | |
| tree | 405a895377da7bc5f221c2b2f6efa4910ce2532c | |
| parent | 02492357cce066201a11993255120119c2703af1 (diff) | |
Centralize dependencies, add D-Bus dep. to README.md
README.md now mentions D-Bus.
Checking dbus presence is now done at the same place as
json-c, libmicrohttpdd...
Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh>
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | plugins/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugins/afm-main-plugin/CMakeLists.txt | 7 |
4 files changed, 5 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fba65e3..7e9502bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ INCLUDE(FindPkgConfig) PKG_CHECK_MODULES(json-c REQUIRED json-c) PKG_CHECK_MODULES(libmicrohttpd REQUIRED libmicrohttpd) PKG_CHECK_MODULES(uuid REQUIRED uuid) +PKG_CHECK_MODULES(dbus REQUIRED dbus-1) # Optional plugin dependencies PKG_CHECK_MODULES(alsa alsa) PKG_CHECK_MODULES(librtlsdr librtlsdr>=0.5.0) @@ -51,8 +52,8 @@ ENDIF(librtlsdr_FOUND) INCLUDE(FindThreads) FIND_PACKAGE(Threads) -SET(include_dirs ${INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include ${json-c_INCLUDE_DIRS} ${libmicrohttpd_INCLUDE_DIRS} ${uuid_INCLUDE_DIRS} ${alsa_INCLUDE_DIRS} ${librtlsdr_INCLUDE_DIRS}) -SET(link_libraries ${json-c_LIBRARIES} ${libmicrohttpd_LIBRARIES} ${uuid_LIBRARIES} ${alsa_LIBRARIES} ${librtlsdr_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${libefence_LIBRARIES} -lmagic -lm -ldl) +SET(include_dirs ${INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include ${json-c_INCLUDE_DIRS} ${libmicrohttpd_INCLUDE_DIRS} ${uuid_INCLUDE_DIRS} ${dbus_INCLUDE_DIRS} ${alsa_INCLUDE_DIRS} ${librtlsdr_INCLUDE_DIRS}) +SET(link_libraries ${json-c_LIBRARIES} ${libmicrohttpd_LIBRARIES} ${uuid_LIBRARIES} ${dbus_LIBRARIES} ${alsa_LIBRARIES} ${librtlsdr_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${libefence_LIBRARIES} -lmagic -lm -ldl) SET(plugin_install_dir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/afb) ADD_DEFINITIONS(-DPLUGIN_INSTALL_DIR="${plugin_install_dir}") @@ -15,6 +15,7 @@ industry requirementsas the primary target for this code is AGL. * libmicrohttpd ("libmicrohttpd-dev/devel"); * json-c ("libjson-c-dev/devel"); * uuid ("uuid-dev/libuuid-devel"); + * dbus ("libdbus-1-dev/dbus-1-devel"); optionally, for plugins : diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 769cc1e1..d8566161 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,5 +1,5 @@ +ADD_SUBDIRECTORY(afm-main-plugin) ADD_SUBDIRECTORY(session) ADD_SUBDIRECTORY(samples) ADD_SUBDIRECTORY(audio) ADD_SUBDIRECTORY(radio) -ADD_SUBDIRECTORY(afm-main-plugin) diff --git a/plugins/afm-main-plugin/CMakeLists.txt b/plugins/afm-main-plugin/CMakeLists.txt index 673bc951..5ed1d4b2 100644 --- a/plugins/afm-main-plugin/CMakeLists.txt +++ b/plugins/afm-main-plugin/CMakeLists.txt @@ -1,14 +1,7 @@ - -pkg_check_modules(EXTRAS REQUIRED dbus-1) -add_compile_options(${EXTRAS_CFLAGS}) -include_directories(${EXTRAS_INCLUDE_DIRS}) -link_libraries(${EXTRAS_LIBRARIES}) - ADD_LIBRARY(afm-main-api MODULE afm-main-plugin.c utils-jbus.c) SET_TARGET_PROPERTIES(afm-main-api PROPERTIES PREFIX "") TARGET_LINK_LIBRARIES(afm-main-api ${link_libraries}) INCLUDE_DIRECTORIES(${include_dirs}) INSTALL(TARGETS afm-main-api LIBRARY DESTINATION ${plugin_install_dir}) - |