Merge pull request #1137 from jagerman/fix-cmake-linux-var-1½

if(LINUX) doesn't work; just try to find libsystemd gently instead
pull/1139/head
Jason Rhinelander 5 years ago committed by GitHub
commit 83fc2c9c04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -226,19 +226,20 @@ if(JEMALLOC)
endif(JEMALLOC) endif(JEMALLOC)
if (LINUX) find_package(PkgConfig QUIET)
pkg_check_modules(SD libsystemd) if(PKG_CONFIG_FOUND)
# Default WITH_SYSTEMD to true if we found it pkg_check_modules(SD libsystemd)
option(WITH_SYSTEMD "enable systemd integration for sd_notify" ${SD_FOUND}) # Default WITH_SYSTEMD to true if we found it
option(WITH_SYSTEMD "enable systemd integration for sd_notify" ${SD_FOUND})
if(WITH_SYSTEMD) if(WITH_SYSTEMD)
if(NOT SD_FOUND) if(NOT SD_FOUND)
message(FATAL_ERROR "libsystemd not found") message(FATAL_ERROR "libsystemd not found")
endif() endif()
add_definitions(-DWITH_SYSTEMD) add_definitions(-DWITH_SYSTEMD)
include_directories(${SD_INCLUDE_DIRS}) include_directories(${SD_INCLUDE_DIRS})
set(SD_LIBS ${SD_LDFLAGS}) set(SD_LIBS ${SD_LDFLAGS})
endif() endif()
endif() endif()
option(SUBMODULE_CHECK "Enables checking that vendored library submodules are up to date" ON) option(SUBMODULE_CHECK "Enables checking that vendored library submodules are up to date" ON)

Loading…
Cancel
Save