diff options
| author | Tomáš Čech <sleep_walker@suse.cz> | 2016-04-28 20:08:41 +0200 |
|---|---|---|
| committer | Tomáš Čech <sleep_walker@suse.cz> | 2016-04-28 20:08:41 +0200 |
| commit | 468ddfb34dd16408ae068f0fb922c75c13df2ef3 (patch) | |
| tree | 3206959421a4ee43c2cba8ebb2856ed5cc55e84e | |
| parent | 89af3f78b2cce23953d4c67603bbc1d09b980bcc (diff) | |
Fix missing include paths
When headers were installed in more sofisticated places (but package
config knows it right), it revealed missing paths in CMake
configuration. Lets fix it.
| -rw-r--r-- | common/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | protocols/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | sway/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | swaybar/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | swaybg/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | swaygrab/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | swaylock/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | wayland/CMakeLists.txt | 1 |
8 files changed, 11 insertions, 3 deletions
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index e5b8f2b9..901a47f9 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -1,5 +1,6 @@ include_directories( ${WLC_INCLUDE_DIRS} + ${XKBCOMMON_INCLUDE_DIRS} ) add_library(sway-common diff --git a/protocols/CMakeLists.txt b/protocols/CMakeLists.txt index d7516d0c..0ff7c704 100644 --- a/protocols/CMakeLists.txt +++ b/protocols/CMakeLists.txt @@ -31,3 +31,4 @@ add_library(sway-protocols ) set(PROTOCOLS_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/protocols PARENT_SCOPE) +INCLUDE_DIRECTORIES(${WAYLAND_INCLUDE_DIR} ${XKBCOMMON_INCLUDE_DIRS}) diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt index 51f27a05..73df3b1b 100644 --- a/sway/CMakeLists.txt +++ b/sway/CMakeLists.txt @@ -7,6 +7,7 @@ include_directories( ${LIBINPUT_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS} + ${WAYLAND_INCLUDE_DIR} ) add_executable(sway diff --git a/swaybar/CMakeLists.txt b/swaybar/CMakeLists.txt index 5b865083..f59a48fd 100644 --- a/swaybar/CMakeLists.txt +++ b/swaybar/CMakeLists.txt @@ -1,9 +1,10 @@ include_directories( ${PROTOCOLS_INCLUDE_DIRS} - ${WAYLAND_CLIENT_INCLUDE_DIR} + ${WAYLAND_INCLUDE_DIR} ${CAIRO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS} ${JSONC_INCLUDE_DIRS} + ${XKBCOMMON_INCLUDE_DIRS} ) add_executable(swaybar diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index c5efae91..f8cad404 100644 --- a/swaybg/CMakeLists.txt +++ b/swaybg/CMakeLists.txt @@ -1,8 +1,9 @@ include_directories( ${PROTOCOLS_INCLUDE_DIRS} - ${WAYLAND_CLIENT_INCLUDE_DIR} + ${WAYLAND_INCLUDE_DIR} ${CAIRO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS} + ${XKBCOMMON_INCLUDE_DIRS} ) add_executable(swaybg diff --git a/swaygrab/CMakeLists.txt b/swaygrab/CMakeLists.txt index 888a9aee..b4aee357 100644 --- a/swaygrab/CMakeLists.txt +++ b/swaygrab/CMakeLists.txt @@ -1,6 +1,7 @@ include_directories( ${JSONC_INCLUDE_DIRS} ${WLC_INCLUDE_DIRS} + ${XKBCOMMON_INCLUDE_DIRS} ) add_executable(swaygrab diff --git a/swaylock/CMakeLists.txt b/swaylock/CMakeLists.txt index b290cd2f..febbd1af 100644 --- a/swaylock/CMakeLists.txt +++ b/swaylock/CMakeLists.txt @@ -1,10 +1,11 @@ include_directories( ${PROTOCOLS_INCLUDE_DIRS} - ${WAYLAND_CLIENT_INCLUDE_DIR} + ${WAYLAND_INCLUDE_DIR} ${CAIRO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS} ${PAM_INCLUDE_DIRS} ${JSONC_INCLUDE_DIRS} + ${XKBCOMMON_INCLUDE_DIRS} ) add_executable(swaylock diff --git a/wayland/CMakeLists.txt b/wayland/CMakeLists.txt index 282ea1aa..df92db9e 100644 --- a/wayland/CMakeLists.txt +++ b/wayland/CMakeLists.txt @@ -2,6 +2,7 @@ include_directories( ${PROTOCOLS_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS} ${XKBCOMMON_INCLUDE_DIRS} + ${WAYLAND_INCLUDE_DIR} ) add_library(sway-wayland |