From 717e6c62020f2408c3a72ab87e0cba410acc17e4 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 28 Feb 2016 18:21:01 -0500 Subject: Added yaml-cpp as a vendor submodule --- CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index c0a0d69..f43e46c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,19 +2,22 @@ cmake_minimum_required (VERSION 2.6) project (rawr-ebooks) find_package(PkgConfig) -pkg_check_modules(YamlCpp yaml-cpp) pkg_check_modules(Curl libcurl) -if (YamlCpp_FOUND AND Curl_FOUND) +if (Curl_FOUND) add_subdirectory(vendor/twitcurl/libtwitcurl) include_directories(vendor/twitcurl/libtwitcurl) + + add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) + include_directories(vendor/yaml-cpp/include) + add_executable(rawr-ebooks ebooks.cpp kgramstats.cpp freevars.cpp histogram.cpp prefix_search.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 ${YamlCpp_LIBRARIES} twitcurl ${Curl_LIBRARIES} aspell) -else (YamlCpp_FOUND AND Curl_FOUND) + target_link_libraries(rawr-ebooks yaml-cpp twitcurl ${Curl_LIBRARIES} aspell) +else (Curl_FOUND) message(STATUS "rawr-ebooks requires yaml-cpp and twitcurl; without these, we will only make rawr-gen") -endif (YamlCpp_FOUND AND Curl_FOUND) +endif (Curl_FOUND) add_executable(rawr-gen gen.cpp kgramstats.cpp freevars.cpp histogram.cpp prefix_search.cpp) set_property(TARGET rawr-gen PROPERTY CXX_STANDARD 11) -- cgit 1.4.1