diff options
| author | Drew DeVault <ddevault@vistarmedia.com> | 2017-07-11 22:16:56 -0400 |
|---|---|---|
| committer | Drew DeVault <ddevault@vistarmedia.com> | 2017-07-11 22:16:56 -0400 |
| commit | b08aa9fd35d650b15a5322bd1b6edea01f152f27 (patch) | |
| tree | 26a5b75622d0a750478dee5c8a5d99f5b75846b6 /session | |
| parent | 7b9c330bc502f7ba4899872cc7d43de95ae5136e (diff) | |
Revert "Merge pull request #27 from ascent12/meson"
This reverts commit 85805da021006697c85489c3e30717c2b807441c, reversing
changes made to 8189c64d7f07a756abf5a6189719f02b2f1af967.
Diffstat (limited to 'session')
| -rw-r--r-- | session/CMakeLists.txt | 35 | ||||
| -rw-r--r-- | session/meson.build | 9 |
2 files changed, 35 insertions, 9 deletions
diff --git a/session/CMakeLists.txt b/session/CMakeLists.txt new file mode 100644 index 00000000..bacd412f --- /dev/null +++ b/session/CMakeLists.txt @@ -0,0 +1,35 @@ +include_directories( + ${WAYLAND_INCLUDE_DIR} + ${DRM_INCLUDE_DIRS} +) + +set(sources + session.c + direct.c + direct-ipc.c +) + +set(libs + wlr-util + ${WAYLAND_LIBRARIES} +) + +if (SYSTEMD_FOUND) + add_definitions(${SYSTEMD_DEFINITIONS}) + include_directories(${SYSTEMD_INCLUDE_DIRS}) + + add_definitions(-DHAS_SYSTEMD) + list(APPEND sources logind.c) + list(APPEND libs ${SYSTEMD_LIBRARIES}) +endif () + +if (Libcap_FOUND) + add_definitions(${Libcap_DEFINITIONS}) + include_directories(${Libcap_INCLUDE_DIRS}) + + add_definitions(-DHAS_LIBCAP) + list(APPEND libs ${Libcap_LIBRARIES}) +endif () + +add_library(wlr-session ${sources}) +target_link_libraries(wlr-session ${libs}) diff --git a/session/meson.build b/session/meson.build deleted file mode 100644 index 4521cff6..00000000 --- a/session/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -wlr_files += files( - 'direct-ipc.c', - 'direct.c', - 'session.c', -) - -if dep_systemd.found() - wlr_files += files('logind.c') -endif |