diff options
| author |  minus <minus@mnus.de> | 2015-08-27 00:06:09 +0200 |
|---|---|---|
| committer | minus <minus@mnus.de> | 2015-08-27 00:06:09 +0200 |
| commit | c948432fb460fbd6d9304034293dcf691a30a628 (patch) | |
| tree | 70816ebb76153e092381dbede629e1f8e89b2395 /CMakeLists.txt | |
| parent | added json-c lib and implemented IPC get_version (diff) | |
| download | sway-c948432fb460fbd6d9304034293dcf691a30a628.tar.gz sway-c948432fb460fbd6d9304034293dcf691a30a628.tar.zst sway-c948432fb460fbd6d9304034293dcf691a30a628.zip | |
fixed json-c CMake inclusion
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e30b52e0..aad7f54d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -22,15 +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(PkgConfig REQUIRED) | 25 | find_package(JsonC REQUIRED) |
| 26 | pkg_check_modules(JSON REQUIRED json-c) | ||
| 27 | 26 | ||
| 28 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) | 27 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) |
| 29 | 28 | ||
| 30 | include_directories( | 29 | include_directories( |
| 31 | ${WLC_INCLUDE_DIRS} | 30 | ${WLC_INCLUDE_DIRS} |
| 32 | ${PCRE_INCLUDE_DIRS} | 31 | ${PCRE_INCLUDE_DIRS} |
| 33 | ${JSON_INCLUDE_DIRS} | 32 | ${JSONC_INCLUDE_DIRS} |
| 34 | include/ | 33 | include/ |
| 35 | ) | 34 | ) |
| 36 | 35 | ||
| @@ -42,7 +41,7 @@ target_link_libraries(sway | |||
| 42 | ${WLC_LIBRARIES} | 41 | ${WLC_LIBRARIES} |
| 43 | ${XKBCOMMON_LIBRARIES} | 42 | ${XKBCOMMON_LIBRARIES} |
| 44 | ${PCRE_LIBRARIES} | 43 | ${PCRE_LIBRARIES} |
| 45 | ${JSON_LIBRARIES} | 44 | ${JSONC_LIBRARIES} |
| 46 | ) | 45 | ) |
| 47 | 46 | ||
| 48 | INSTALL( | 47 | INSTALL( |