wip: Update CMakeLists

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})
-
+link_libraries(${X11_LIBRARIES})
-if(ENABLE_ALSA)
+link_libraries(${FREETYPE_LIBRARIES})
-  find_package(ALSA REQUIRED)
+link_libraries(${FONTCONFIG_LIBRARIES})
-endif()
+link_libraries()
-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()
 
 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 {{{

lib/i3ipcpp

@@ -1 +1 @@
-Subproject commit 536281d9a6013077218d0d0a69546ec41af9fec7
+Subproject commit 47d4c43bbb2d7529bb1e178115b61247e0010fd6

src/CMakeLists.txt

@@ -16,19 +16,7 @@ make_library(${library_name} STATIC
   HEADERS
     ${headers}
   SOURCES
-    ${sources}
+    ${sources})
-  CMAKE_DEPENDS
-    XPP
-    FREETYPE
-    I3IPCPP
-    ALSA
-    LIBIW
-    LIBMPDCLIENT
-    X11
-    X11_XFT
-    X11_XCB
-  PKG_DEPENDS
-    FONTCONFIG)
 
 make_executable(${executable_name}
   SOURCES main.cpp