external
/
uhub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #35 from CoiLock/master 

Fixed compilation on systemd > 210
This commit is contained in:
Jan Vidar Krey 2016-03-07 18:17:07 +01:00
parent dc80644471 70f2a43f67
commit ed5a59b16c
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -56,8 +56,7 @@ endif()
if (SYSTEMD_SUPPORT) if (SYSTEMD_SUPPORT)
INCLUDE(FindPkgConfig) INCLUDE(FindPkgConfig)
pkg_search_module(SD_DAEMON REQUIRED libsystemd-daemon) pkg_search_module(SD REQUIRED libsystemd)
pkg_search_module(SD_JOURNAL REQUIRED libsystemd-journal)
endif() endif()
if (MSVC) if (MSVC)
@ -212,14 +211,11 @@ if(SSL_SUPPORT)
endif() endif()
if (SYSTEMD_SUPPORT) if (SYSTEMD_SUPPORT)
target_link_libraries(uhub ${SD_DAEMON_LIBRARIES}) target_link_libraries(uhub ${SD_LIBRARIES})
target_link_libraries(uhub ${SD_JOURNAL_LIBRARIES}) target_link_libraries(test ${SD_LIBRARIES})
target_link_libraries(test ${SD_DAEMON_LIBRARIES}) target_link_libraries(uhub-passwd ${SD_LIBRARIES})
target_link_libraries(test ${SD_JOURNAL_LIBRARIES}) target_link_libraries(uhub-admin ${SD_LIBRARIES})
target_link_libraries(uhub-passwd ${SD_JOURNAL_LIBRARIES}) include_directories(${SD_INCLUDE_DIRS})
target_link_libraries(uhub-admin ${SD_JOURNAL_LIBRARIES})
include_directories(${SD_DAEMON_INCLUDE_DIRS})
include_directories(${SD_JOURNAL_INCLUDE_DIRS})
add_definitions(-DSYSTEMD) add_definitions(-DSYSTEMD)
endif() endif()