diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-08-05 18:26:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-05 18:26:13 -0400 |
| commit | d6d1d57c69daf301bbefe76b81d8fb12f54a2812 (patch) | |
| tree | 6980684640b9089bed5324388386427fbca63fdf /session | |
| parent | ce886c03539319f7b3327a4adde3c912e349e0f4 (diff) | |
| parent | fdab81e1c95f872e61ab6ff4be65f09fe552f6f2 (diff) | |
Merge pull request #31 from nyorain/merged
Use meson as build system
Diffstat (limited to 'session')
| -rw-r--r-- | session/CMakeLists.txt | 35 | ||||
| -rw-r--r-- | session/meson.build | 9 |
2 files changed, 9 insertions, 35 deletions
diff --git a/session/CMakeLists.txt b/session/CMakeLists.txt deleted file mode 100644 index bacd412f..00000000 --- a/session/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -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 new file mode 100644 index 00000000..4521cff6 --- /dev/null +++ b/session/meson.build @@ -0,0 +1,9 @@ +wlr_files += files( + 'direct-ipc.c', + 'direct.c', + 'session.c', +) + +if dep_systemd.found() + wlr_files += files('logind.c') +endif |