Merge pull request #610 from sleep-walker/master

CMake related improvements

9 files changed, 15 insertions, 7 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf4fe49b..cf115b3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1.0)
 
 project(sway C)
 
-set(CMAKE_C_FLAGS "-g")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_EXTENSIONS OFF)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index e5b8f2b9..9c2c0a99 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,8 +1,9 @@
 include_directories(
         ${WLC_INCLUDE_DIRS}
+        ${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 d7516d0c..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}
@@ -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 51f27a05..73df3b1b 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 5b865083..f59a48fd 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 c5efae91..f8cad404 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 888a9aee..b4aee357 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 b290cd2f..febbd1af 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 282ea1aa..54fe3e23 100644
--- a/wayland/CMakeLists.txt
+++ b/wayland/CMakeLists.txt
@@ -2,9 +2,10 @@ include_directories(
         ${PROTOCOLS_INCLUDE_DIRS}
         ${PANGO_INCLUDE_DIRS}
         ${XKBCOMMON_INCLUDE_DIRS}
+        ${WAYLAND_INCLUDE_DIR}
 )
 
-add_library(sway-wayland
+add_library(sway-wayland STATIC
         buffers.c
         pango.c
         registry.c