3 files changed, 10 insertions, 9 deletions

@@ -4,6 +4,3 @@
 [submodule "vendor/libtwittercpp"]
         path = vendor/libtwittercpp
         url = git@github.com:hatkirby/libtwittercpp
-[submodule "vendor/yaml-cpp"]
-        path = vendor/yaml-cpp
-        url = git@github.com:jbeder/yaml-cpp
@@ -1,19 +1,23 @@
 cmake_minimum_required (VERSION 3.1)
 project (grunge)
 
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
 add_subdirectory(vendor/libtwittercpp)
 add_subdirectory(vendor/verbly)
-add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
 
 find_package(PkgConfig)
+pkg_check_modules(yaml-cpp yaml-cpp REQUIRED)
 pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED)
 
-include_directories(${GraphicsMagick_INCLUDE_DIRS} vendor/verbly/lib vendor/libtwittercpp/src vendor/yaml-cpp/include vendor/libtwittercpp/vendor/curlcpp/include)
+include_directories(
+  vendor/libtwittercpp/src
+  vendor/libtwittercpp/vendor/curlcpp/include
+  vendor/verbly/lib
+  ${yaml-cpp_INCLUDE_DIRS}
+  ${GraphicsMagick_INCLUDE_DIRS})
+
 link_directories(${GraphicsMagick_LIBRARY_DIRS})
+
 add_executable(grunge main.cpp grunge.cpp palette.cpp)
 set_property(TARGET grunge PROPERTY CXX_STANDARD 11)
 set_property(TARGET grunge PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(grunge ${GraphicsMagick_LIBRARIES} verbly yaml-cpp twitter++)
-
+target_link_libraries(grunge ${yaml-cpp_LIBRARIES} ${GraphicsMagick_LIBRARIES} verbly twitter++)
-Subproject bedb28fdb4fd52d97e02f6cb946cae631037089