From 468ddfb34dd16408ae068f0fb922c75c13df2ef3 Mon Sep 17 00:00:00 2001
From: Tomáš Čech <sleep_walker@suse.cz>
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.
---
 common/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'common')

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
-- 
cgit v1.2.3


From bcdeb721893264d4c9c3471c3955ae20ce1b6e89 Mon Sep 17 00:00:00 2001
From: Tomáš Čech <sleep_walker@suse.cz>
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.
---
 common/CMakeLists.txt    | 2 +-
 protocols/CMakeLists.txt | 2 +-
 wayland/CMakeLists.txt   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'common')

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 901a47f9..9c2c0a99 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(
 	${XKBCOMMON_INCLUDE_DIRS}
 )
 
-add_library(sway-common
+add_library(sway-common STATIC
 	ipc-client.c
 	list.c
 	log.c
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}
diff --git a/wayland/CMakeLists.txt b/wayland/CMakeLists.txt
index df92db9e..54fe3e23 100644
--- a/wayland/CMakeLists.txt
+++ b/wayland/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(
 	${WAYLAND_INCLUDE_DIR}
 )
 
-add_library(sway-wayland
+add_library(sway-wayland STATIC
 	buffers.c
 	pango.c
 	registry.c
-- 
cgit v1.2.3