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.
This commit is contained in:
Tomáš Čech 2016-04-28 20:08:41 +02:00
parent 89af3f78b2
commit 468ddfb34d
8 changed files with 11 additions and 3 deletions

View file

@ -1,5 +1,6 @@
include_directories( include_directories(
${WLC_INCLUDE_DIRS} ${WLC_INCLUDE_DIRS}
${XKBCOMMON_INCLUDE_DIRS}
) )
add_library(sway-common add_library(sway-common

View file

@ -31,3 +31,4 @@ add_library(sway-protocols
) )
set(PROTOCOLS_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/protocols PARENT_SCOPE) set(PROTOCOLS_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/protocols PARENT_SCOPE)
INCLUDE_DIRECTORIES(${WAYLAND_INCLUDE_DIR} ${XKBCOMMON_INCLUDE_DIRS})

View file

@ -7,6 +7,7 @@ include_directories(
${LIBINPUT_INCLUDE_DIRS} ${LIBINPUT_INCLUDE_DIRS}
${CAIRO_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS}
${PANGO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS}
${WAYLAND_INCLUDE_DIR}
) )
add_executable(sway add_executable(sway

View file

@ -1,9 +1,10 @@
include_directories( include_directories(
${PROTOCOLS_INCLUDE_DIRS} ${PROTOCOLS_INCLUDE_DIRS}
${WAYLAND_CLIENT_INCLUDE_DIR} ${WAYLAND_INCLUDE_DIR}
${CAIRO_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS}
${PANGO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS}
${JSONC_INCLUDE_DIRS} ${JSONC_INCLUDE_DIRS}
${XKBCOMMON_INCLUDE_DIRS}
) )
add_executable(swaybar add_executable(swaybar

View file

@ -1,8 +1,9 @@
include_directories( include_directories(
${PROTOCOLS_INCLUDE_DIRS} ${PROTOCOLS_INCLUDE_DIRS}
${WAYLAND_CLIENT_INCLUDE_DIR} ${WAYLAND_INCLUDE_DIR}
${CAIRO_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS}
${PANGO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS}
${XKBCOMMON_INCLUDE_DIRS}
) )
add_executable(swaybg add_executable(swaybg

View file

@ -1,6 +1,7 @@
include_directories( include_directories(
${JSONC_INCLUDE_DIRS} ${JSONC_INCLUDE_DIRS}
${WLC_INCLUDE_DIRS} ${WLC_INCLUDE_DIRS}
${XKBCOMMON_INCLUDE_DIRS}
) )
add_executable(swaygrab add_executable(swaygrab

View file

@ -1,10 +1,11 @@
include_directories( include_directories(
${PROTOCOLS_INCLUDE_DIRS} ${PROTOCOLS_INCLUDE_DIRS}
${WAYLAND_CLIENT_INCLUDE_DIR} ${WAYLAND_INCLUDE_DIR}
${CAIRO_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS}
${PANGO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS}
${PAM_INCLUDE_DIRS} ${PAM_INCLUDE_DIRS}
${JSONC_INCLUDE_DIRS} ${JSONC_INCLUDE_DIRS}
${XKBCOMMON_INCLUDE_DIRS}
) )
add_executable(swaylock add_executable(swaylock

View file

@ -2,6 +2,7 @@ include_directories(
${PROTOCOLS_INCLUDE_DIRS} ${PROTOCOLS_INCLUDE_DIRS}
${PANGO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS}
${XKBCOMMON_INCLUDE_DIRS} ${XKBCOMMON_INCLUDE_DIRS}
${WAYLAND_INCLUDE_DIR}
) )
add_library(sway-wayland add_library(sway-wayland