From 468ddfb34dd16408ae068f0fb922c75c13df2ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= Date: Thu, 28 Apr 2016 20:08:41 +0200 Subject: [PATCH] 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. --- common/CMakeLists.txt | 1 + protocols/CMakeLists.txt | 1 + sway/CMakeLists.txt | 1 + swaybar/CMakeLists.txt | 3 ++- swaybg/CMakeLists.txt | 3 ++- swaygrab/CMakeLists.txt | 1 + swaylock/CMakeLists.txt | 3 ++- wayland/CMakeLists.txt | 1 + 8 files changed, 11 insertions(+), 3 deletions(-) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index e5b8f2b91..901a47f98 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 d7516d0cd..0ff7c704f 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 51f27a057..73df3b1bc 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 5b865083b..f59a48fd1 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 c5efae91e..f8cad4049 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 888a9aee5..b4aee3573 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 b290cd2fb..febbd1af0 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 282ea1aa2..df92db9ec 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