summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian.Linke <christian.linke@bmw.de>2015-12-15 07:51:36 -0800
committerChristian.Linke <christian.linke@bmw.de>2015-12-15 07:51:36 -0800
commitc6fdb262766ff704ea204052492a7ef57e3d2ab0 (patch)
tree82ce2159034f9b96051b0d651646b8d7282f96c2
parent9455195e096ea5f9a82a358bf55b405029e13d2d (diff)
downloadaudiomanager-c6fdb262766ff704ea204052492a7ef57e3d2ab0.tar.gz
changed package config for systemd
-rw-r--r--AudioManagerDaemon/CMakeLists.txt9
-rw-r--r--AudioManagerUtilities/CMakeLists.txt8
2 files changed, 8 insertions, 9 deletions
diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt
index 5165141..d044ed8 100644
--- a/AudioManagerDaemon/CMakeLists.txt
+++ b/AudioManagerDaemon/CMakeLists.txt
@@ -36,15 +36,6 @@ if (WITH_DATABASE_STORAGE)
pkg_check_modules(SQLITE REQUIRED sqlite3)
endif (WITH_DATABASE_STORAGE)
-if (WITH_SYSTEMD_WATCHDOG)
- pkg_check_modules(SYSTEMD libsystemd-daemon>=44)
- if (SYSTEMD_FOUND)
- message(STATUS "Found libsystemd-daemon, version: ${SYSTEMD_VERSION}")
- else (SYSTEMD_FOUND)
- message(STATUS "Did not find libsystemd-daemon, using own lib")
- endif(SYSTEMD_FOUND)
-endif (WITH_SYSTEMD_WATCHDOG)
-
if(WITH_DBUS_WRAPPER)
pkg_check_modules (DBUS "dbus-1 >= 1.4")
endif(WITH_DBUS_WRAPPER)
diff --git a/AudioManagerUtilities/CMakeLists.txt b/AudioManagerUtilities/CMakeLists.txt
index cc122eb..faa7da5 100644
--- a/AudioManagerUtilities/CMakeLists.txt
+++ b/AudioManagerUtilities/CMakeLists.txt
@@ -42,6 +42,14 @@ SET(AUDIO_MANAGER_UTILITIES_SRCS_CXX
src/CAmSocketHandler.cpp)
if(WITH_SYSTEMD_WATCHDOG)
+
+ pkg_check_modules(SYSTEMD libsystemd>=44)
+ if (SYSTEMD_FOUND)
+ message(STATUS "Found libsystemd-daemon, version: ${SYSTEMD_VERSION}")
+ else (SYSTEMD_FOUND)
+ message(STATUS "Did not find libsystemd-daemon, using own lib")
+ endif(SYSTEMD_FOUND)
+
set (AUDIO_MANAGER_UTILITIES_SRCS_CXX
${AUDIO_MANAGER_UTILITIES_SRCS_CXX}
src/CAmWatchdog.cpp)