From 247ee4de24eab5ecd030542724db9f69aaa1ed1a Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Wed, 17 Jan 2018 14:56:49 -0500 Subject: Removed yaml-cpp submodule Project now links against a local installation of yaml-cpp. --- CMakeLists.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index ddc6744..1b73fb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) -- cgit 1.4.1