3 files changed, 9 insertions, 9 deletions

@@ -1,6 +1,3 @@
-[submodule "vendor/yaml-cpp"]
-        path = vendor/yaml-cpp
-        url = https://github.com/jbeder/yaml-cpp
 [submodule "vendor/libtwittercpp"]
         path = vendor/libtwittercpp
         url = https://github.com/hatkirby/libtwittercpp
@@ -4,13 +4,16 @@ project (rawr-ebooks)
 set(CMAKE_BUILD_TYPE Debug)
 
 add_subdirectory(vendor/libtwittercpp)
-include_directories(vendor/libtwittercpp/src)
-
-add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
-include_directories(vendor/yaml-cpp/include)
 
 find_package(ASPELL REQUIRED)
-include_directories(${ASPELL_INCLUDE_DIR})
+
+find_package(PkgConfig)
+pkg_check_modules(yaml-cpp yaml-cpp REQUIRED)
+
+include_directories(
+  vendor/libtwittercpp/src
+  ${ASPELL_INCLUDE_DIR}
+  ${yaml-cpp_INCLUDE_DIRS})
 
 add_library(rawr kgramstats.cpp histogram.cpp prefix_search.cpp)
 set_property(TARGET rawr PROPERTY CXX_STANDARD 11)
@@ -20,7 +23,7 @@ target_link_libraries(rawr ${ASPELL_LIBRARIES})
 add_executable(rawr-ebooks ebooks.cpp)
 set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD 11)
 set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(rawr-ebooks rawr yaml-cpp twitter++)
+target_link_libraries(rawr-ebooks rawr ${yaml-cpp_LIBRARIES} twitter++)
 
 add_executable(rawr-gen gen.cpp)
 set_property(TARGET rawr-gen PROPERTY CXX_STANDARD 11)
-Subproject 57805dfd6a741e55477ea8d4d5b3b6f0272d1f0