diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-12-01 08:21:01 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-01 08:21:01 -0500 |
commit | 1cfebe827ae53a243ffdd1e09f8b71d4c1a4e254 (patch) | |
tree | b74002984ff80201c02ed9c22ca2fe1cdae98e23 /common | |
parent | Merge pull request #1482 from acrisci/refactor/use-frame-done (diff) | |
parent | update travis (diff) | |
download | sway-1cfebe827ae53a243ffdd1e09f8b71d4c1a4e254.tar.gz sway-1cfebe827ae53a243ffdd1e09f8b71d4c1a4e254.tar.zst sway-1cfebe827ae53a243ffdd1e09f8b71d4c1a4e254.zip |
Merge pull request #1479 from acrisci/feature/meson-build
meson build
Diffstat (limited to 'common')
-rw-r--r-- | common/CMakeLists.txt | 15 | ||||
-rw-r--r-- | common/meson.build | 11 |
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 @@ | |||
1 | include_directories( | ||
2 | ${WLC_INCLUDE_DIRS} | ||
3 | ${XKBCOMMON_INCLUDE_DIRS} | ||
4 | ) | ||
5 | |||
6 | add_library(sway-common STATIC | ||
7 | ipc-client.c | ||
8 | list.c | ||
9 | log.c | ||
10 | util.c | ||
11 | readline.c | ||
12 | stringop.c | ||
13 | ) | ||
14 | |||
15 | 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 @@ | |||
1 | lib_sway_common = static_library('sway-common', | ||
2 | files( | ||
3 | 'log.c', | ||
4 | 'list.c', | ||
5 | 'util.c', | ||
6 | 'stringop.c', | ||
7 | 'readline.c', | ||
8 | 'ipc-client.c' | ||
9 | ), | ||
10 | include_directories: sway_inc | ||
11 | ) | ||