diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-08-26 18:48:50 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-08-26 18:48:50 -0400 |
commit | eb53f173c5cc3739149b3fafc50ab55d5503a649 (patch) | |
tree | 49eae9ae84adbe27d639005515111b324a328fad /CMakeLists.txt | |
parent | some function documentation, fixed gaps on config reload (diff) | |
parent | fixed container_map (diff) | |
download | sway-eb53f173c5cc3739149b3fafc50ab55d5503a649.tar.gz sway-eb53f173c5cc3739149b3fafc50ab55d5503a649.tar.zst sway-eb53f173c5cc3739149b3fafc50ab55d5503a649.zip |
Merge pull request #137 from minus7/json
added json-c lib and implemented IPC get_version
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bbf61299..aad7f54d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -22,12 +22,14 @@ find_package(XKBCommon REQUIRED) | |||
22 | find_package(WLC REQUIRED) | 22 | find_package(WLC REQUIRED) |
23 | find_package(A2X REQUIRED) | 23 | find_package(A2X REQUIRED) |
24 | find_package(PCRE REQUIRED) | 24 | find_package(PCRE REQUIRED) |
25 | find_package(JsonC REQUIRED) | ||
25 | 26 | ||
26 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) | 27 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) |
27 | 28 | ||
28 | include_directories( | 29 | include_directories( |
29 | ${WLC_INCLUDE_DIRS} | 30 | ${WLC_INCLUDE_DIRS} |
30 | ${PCRE_INCLUDE_DIRS} | 31 | ${PCRE_INCLUDE_DIRS} |
32 | ${JSONC_INCLUDE_DIRS} | ||
31 | include/ | 33 | include/ |
32 | ) | 34 | ) |
33 | 35 | ||
@@ -39,6 +41,7 @@ target_link_libraries(sway | |||
39 | ${WLC_LIBRARIES} | 41 | ${WLC_LIBRARIES} |
40 | ${XKBCOMMON_LIBRARIES} | 42 | ${XKBCOMMON_LIBRARIES} |
41 | ${PCRE_LIBRARIES} | 43 | ${PCRE_LIBRARIES} |
44 | ${JSONC_LIBRARIES} | ||
42 | ) | 45 | ) |
43 | 46 | ||
44 | INSTALL( | 47 | INSTALL( |