diff options
| author |  Ethan <nuew@users.noreply.github.com> | 2016-03-24 18:57:31 -0400 |
|---|---|---|
| committer | Ethan <nuew@users.noreply.github.com> | 2016-03-24 18:57:31 -0400 |
| commit | df57d1b70215439b129722c0dc867ac8ed6a872e (patch) | |
| tree | 338ce8e2c22348bcbb6b5637889531d758da9510 | |
| parent | Change 'display' to 'output' in swaylock error messages where necessary (diff) | |
| parent | CMake: add missing wlc include dir for common and swaygrab (diff) | |
| download | sway-df57d1b70215439b129722c0dc867ac8ed6a872e.tar.gz sway-df57d1b70215439b129722c0dc867ac8ed6a872e.tar.zst sway-df57d1b70215439b129722c0dc867ac8ed6a872e.zip | |
Merge branch 'master' into display-images
| -rw-r--r-- | common/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | swaygrab/CMakeLists.txt | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 38767249..e5b8f2b9 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | include_directories( | ||
| 2 | ${WLC_INCLUDE_DIRS} | ||
| 3 | ) | ||
| 4 | |||
| 1 | add_library(sway-common | 5 | add_library(sway-common |
| 2 | ipc-client.c | 6 | ipc-client.c |
| 3 | list.c | 7 | list.c |
diff --git a/swaygrab/CMakeLists.txt b/swaygrab/CMakeLists.txt index 85ad3907..888a9aee 100644 --- a/swaygrab/CMakeLists.txt +++ b/swaygrab/CMakeLists.txt | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | include_directories( | 1 | include_directories( |
| 2 | ${JSONC_INCLUDE_DIRS} | 2 | ${JSONC_INCLUDE_DIRS} |
| 3 | ${WLC_INCLUDE_DIRS} | ||
| 3 | ) | 4 | ) |
| 4 | 5 | ||
| 5 | add_executable(swaygrab | 6 | add_executable(swaygrab |