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. --- 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: =?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. --- common/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 -- cgit v1.2.3