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: 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. --- protocols/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'protocols/CMakeLists.txt') 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}) -- cgit v1.2.3 From bcdeb721893264d4c9c3471c3955ae20ce1b6e89 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:13:26 +0200 Subject: Explicitly mark static linking in CMake When no type is given, it depends on BUILD_SHARED_LIBS value which is not desired in this case. --- protocols/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'protocols/CMakeLists.txt') diff --git a/protocols/CMakeLists.txt b/protocols/CMakeLists.txt index 0ff7c704..ff0a2e4d 100644 --- a/protocols/CMakeLists.txt +++ b/protocols/CMakeLists.txt @@ -22,7 +22,7 @@ WAYLAND_ADD_PROTOCOL_SERVER(proto-server-swaylock swaylock ) -add_library(sway-protocols +add_library(sway-protocols STATIC ${proto-client-xdg-shell} ${proto-client-desktop-shell} ${proto-server-desktop-shell} -- cgit v1.2.3