diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-03-25 06:14:13 +0100 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-03-25 06:14:13 +0100 |
| commit | b97deaecc5743c40a6ea3301ba4f2f09af912cb8 (patch) | |
| tree | 570da462129bec5a5d8865da3863f8302d829869 /cmake | |
| parent | 2a1ad90ae34ad461c80fd52f6ea00bd8cb5c984a (diff) | |
| download | fastd-b97deaecc5743c40a6ea3301ba4f2f09af912cb8.tar fastd-b97deaecc5743c40a6ea3301ba4f2f09af912cb8.zip | |
Don't depend on libsystemd-daemon for systemd integration, always use systemd integration on Linux
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/config.cmake | 2 | ||||
| -rw-r--r-- | cmake/deps.cmake | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/cmake/config.cmake b/cmake/config.cmake index 8390bf2..e7e0f42 100644 --- a/cmake/config.cmake +++ b/cmake/config.cmake @@ -9,6 +9,7 @@ set(USE_BINDTODEVICE ${LINUX}) set(USE_PMTU ${LINUX}) set(USE_PKTINFO ${LINUX}) set(USE_PACKET_MARK ${LINUX}) +set(USE_SYSTEMD ${LINUX}) if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") set(USE_MULTIAF_BIND FALSE) @@ -20,7 +21,6 @@ set(WITH_CAPABILITIES ${LINUX} CACHE BOOL "Include support for POSIX capabilitie set(ENABLE_LIBSODIUM FALSE CACHE BOOL "Use libsodium instead of NaCl") set(ENABLE_OPENSSL FALSE CACHE BOOL "Enable crypto implementations using OpenSSL") -set(ENABLE_SYSTEMD FALSE CACHE BOOL "Enable systemd support") set(WITH_CMDLINE_USER TRUE CACHE BOOL "Include support for setting user/group related options on the command line") set(WITH_CMDLINE_LOGGING TRUE CACHE BOOL "Include support for setting logging related options on the command line") diff --git a/cmake/deps.cmake b/cmake/deps.cmake index 98c7582..d9dff1e 100644 --- a/cmake/deps.cmake +++ b/cmake/deps.cmake @@ -52,16 +52,6 @@ else(ENABLE_OPENSSL) set(OPENSSL_CRYPTO_LDFLAGS_OTHER "") endif(ENABLE_OPENSSL) -if(ENABLE_SYSTEMD) - pkg_check_modules(SYSTEMD_DAEMON REQUIRED libsystemd-daemon) -else(ENABLE_SYSTEMD) - set(SYSTEMD_DAEMON_INCLUDE_DIRS "") - set(SYSTEMD_DAEMON_CFLAGS_OTHER "") - set(SYSTEMD_DAEMON_LIBRARY_DIRS "") - set(SYSTEMD_DAEMON_LIBRARIES "") - set(SYSTEMD_DAEMON_LDFLAGS_OTHER "") -endif(ENABLE_SYSTEMD) - if(WITH_CAPABILITIES) find_package(CAP REQUIRED) |