aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-07-11 20:15:28 -0400
committerGitHub <noreply@github.com>2017-07-11 20:15:28 -0400
commit85805da021006697c85489c3e30717c2b807441c (patch)
treeae4a0221b8747579314262b59ff01bec2a32d3b8 /util
parent8189c64d7f07a756abf5a6189719f02b2f1af967 (diff)
parente54b1eded4fc44e6f3d22af2f16d5e055dfd0045 (diff)
Merge pull request #27 from ascent12/meson
[Proposal] Use the Meson build system
Diffstat (limited to 'util')
-rw-r--r--util/CMakeLists.txt6
-rw-r--r--util/meson.build4
2 files changed, 4 insertions, 6 deletions
diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
deleted file mode 100644
index 5a057889..00000000
--- a/util/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-add_library(wlr-util STATIC
- list.c
- log.c
-)
-
-target_link_libraries(wlr-util m)
diff --git a/util/meson.build b/util/meson.build
new file mode 100644
index 00000000..7b80c23f
--- /dev/null
+++ b/util/meson.build
@@ -0,0 +1,4 @@
+wlr_files += files(
+ 'list.c',
+ 'log.c',
+)