aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-12-01 08:21:01 -0500
committerGitHub <noreply@github.com>2017-12-01 08:21:01 -0500
commit1cfebe827ae53a243ffdd1e09f8b71d4c1a4e254 (patch)
treeb74002984ff80201c02ed9c22ca2fe1cdae98e23 /common
parent1fbcd097ae2841b5f8f56cf67c1e94605deb0d25 (diff)
parent3546412fc9fb9a51b4316070eff4991c14594127 (diff)
Merge pull request #1479 from acrisci/feature/meson-build
meson build
Diffstat (limited to 'common')
-rw-r--r--common/CMakeLists.txt15
-rw-r--r--common/meson.build11
2 files changed, 11 insertions, 15 deletions
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
deleted file mode 100644
index 4fa71f3a..00000000
--- a/common/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-include_directories(
- ${WLC_INCLUDE_DIRS}
- ${XKBCOMMON_INCLUDE_DIRS}
-)
-
-add_library(sway-common STATIC
- ipc-client.c
- list.c
- log.c
- util.c
- readline.c
- stringop.c
-)
-
-target_link_libraries(sway-common m)
diff --git a/common/meson.build b/common/meson.build
new file mode 100644
index 00000000..3a4282ad
--- /dev/null
+++ b/common/meson.build
@@ -0,0 +1,11 @@
+lib_sway_common = static_library('sway-common',
+ files(
+ 'log.c',
+ 'list.c',
+ 'util.c',
+ 'stringop.c',
+ 'readline.c',
+ 'ipc-client.c'
+ ),
+ include_directories: sway_inc
+)