From c4e9f9d035728891cd958e868e1123345b3aeb40 Mon Sep 17 00:00:00 2001
From: Michael Carlberg <c@rlberg.se>
Date: Wed, 12 Oct 2016 02:16:48 +0200
Subject: [PATCH] wip: Update CMakeLists

---
 CMakeLists.txt     | 37 ++++++++++++++++++++++++-------------
 lib/i3ipcpp        |  2 +-
 src/CMakeLists.txt | 14 +-------------
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0e498b3..9219acae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,28 +93,39 @@ link_libraries(${X11_Xft_LIB})
 link_libraries(${X11_XCB_LIB})
 link_libraries(${BOOST_LIBRARIES})
 link_libraries(${CMAKE_THREAD_LIBS_INIT})
-
-if(ENABLE_ALSA)
-  find_package(ALSA REQUIRED)
-endif()
-if(ENABLE_MPD)
-  find_package(LibMPDClient REQUIRED)
-endif()
-if(ENABLE_NETWORK)
-  find_package(Libiw REQUIRED)
-endif()
-if(ENABLE_I3)
-  add_subdirectory(${PROJECT_SOURCE_DIR}/lib/i3ipcpp EXCLUDE_FROM_ALL)
-endif()
+link_libraries(${X11_LIBRARIES})
+link_libraries(${FREETYPE_LIBRARIES})
+link_libraries(${FONTCONFIG_LIBRARIES})
+link_libraries()
 
 include_directories(
   ${BOOST_INCLUDE_DIR}
+  ${FONTCONFIG_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/include
   ${PROJECT_SOURCE_DIR}/lib/boost/include
   ${PROJECT_SOURCE_DIR}/lib/fastdelegate/include)
 
 set(XCB_PROTOS xproto randr)
 add_subdirectory(${PROJECT_SOURCE_DIR}/lib/xpp)
+link_libraries(${XPP_LIBRARIES})
+
+if(ENABLE_ALSA)
+  find_package(ALSA REQUIRED)
+  link_libraries(${ALSA_LIBRARY})
+endif()
+if(ENABLE_MPD)
+  find_package(LibMPDClient REQUIRED)
+  link_libraries(${LIBMPDCLIENT_LIBRARIES})
+endif()
+if(ENABLE_NETWORK)
+  find_package(Libiw REQUIRED)
+  link_libraries(${LIBIW_LIBRARY})
+endif()
+if(ENABLE_I3)
+  add_subdirectory(${PROJECT_SOURCE_DIR}/lib/i3ipcpp EXCLUDE_FROM_ALL)
+  include_directories(${I3IPCPP_INCLUDE_DIRS})
+  link_libraries(${I3IPCPP_LIBRARIES})
+endif()
 
 # }}}
 # Build source tree {{{
diff --git a/lib/i3ipcpp b/lib/i3ipcpp
index 536281d9..47d4c43b 160000
--- a/lib/i3ipcpp
+++ b/lib/i3ipcpp
@@ -1 +1 @@
-Subproject commit 536281d9a6013077218d0d0a69546ec41af9fec7
+Subproject commit 47d4c43bbb2d7529bb1e178115b61247e0010fd6
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fc343b03..8232b466 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,19 +16,7 @@ make_library(${library_name} STATIC
   HEADERS
     ${headers}
   SOURCES
-    ${sources}
-  CMAKE_DEPENDS
-    XPP
-    FREETYPE
-    I3IPCPP
-    ALSA
-    LIBIW
-    LIBMPDCLIENT
-    X11
-    X11_XFT
-    X11_XCB
-  PKG_DEPENDS
-    FONTCONFIG)
+    ${sources})
 
 make_executable(${executable_name}
   SOURCES main.cpp