From 2e9183e4de8fb5b5bcb2c6e2416a6b0b4a48682d Mon Sep 17 00:00:00 2001
From: Ben Boeckel <mathstuf@gmail.com>
Date: Thu, 12 Nov 2015 21:32:36 -0500
Subject: cmake: set the output directory once

---
 swaybg/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'swaybg')

diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt
index 9351441a..20aff980 100644
--- a/swaybg/CMakeLists.txt
+++ b/swaybg/CMakeLists.txt
@@ -7,7 +7,6 @@ find_package(Pango REQUIRED)
 include(Wayland)
 WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "xdg-shell.xml" xdg-shell)
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/")
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/../include
   ${WAYLAND_CLIENT_INCLUDE_DIR}
-- 
cgit v1.2.3


From 98678dea5d395e08de5bf28d3c9b4f48ea6f6589 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <mathstuf@gmail.com>
Date: Thu, 12 Nov 2015 21:37:35 -0500
Subject: cmake: clean up installation rules

---
 swaybg/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'swaybg')

diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt
index 20aff980..e86cf656 100644
--- a/swaybg/CMakeLists.txt
+++ b/swaybg/CMakeLists.txt
@@ -26,7 +26,7 @@ add_executable(swaybg
 
 TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES})
 
-INSTALL(
-  TARGETS swaybg
-  RUNTIME DESTINATION bin
-)
+install(
+  TARGETS   swaybg
+  RUNTIME   DESTINATION bin
+  COMPONENT runtime)
-- 
cgit v1.2.3


From ec013d1f1a5e0345353009f97dc506420995db6b Mon Sep 17 00:00:00 2001
From: Ben Boeckel <mathstuf@gmail.com>
Date: Thu, 12 Nov 2015 21:42:37 -0500
Subject: common: create a static library

---
 swaybg/CMakeLists.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'swaybg')

diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt
index e86cf656..1ad43324 100644
--- a/swaybg/CMakeLists.txt
+++ b/swaybg/CMakeLists.txt
@@ -8,7 +8,6 @@ include(Wayland)
 WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "xdg-shell.xml" xdg-shell)
 
 include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/../include
   ${WAYLAND_CLIENT_INCLUDE_DIR}
   ${CAIRO_INCLUDE_DIRS}
   ${PANGO_INCLUDE_DIRS}
@@ -16,7 +15,6 @@ include_directories(
 
 FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c)
 FILE(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c)
-FILE(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c)
 
 add_executable(swaybg
   ${sources}
@@ -24,7 +22,7 @@ add_executable(swaybg
   ${common}
 )
 
-TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES})
+TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} sway_common)
 
 install(
   TARGETS   swaybg
-- 
cgit v1.2.3