From 8be8513a29b277d7919c3033840611ce25b213ce Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Mon, 1 Feb 2016 09:37:46 -0500 Subject: Switched to pkg-config for finding libcurl --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index a76cc2a..74b6d51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,18 +3,18 @@ project (rawr-ebooks) find_package(PkgConfig) pkg_check_modules(YamlCpp yaml-cpp) -find_package(curl) +pkg_check_modules(Curl libcurl) -if (YamlCpp_FOUND AND CURL_FOUND) +if (YamlCpp_FOUND AND Curl_FOUND) add_subdirectory(vendor/twitcurl/libtwitcurl) include_directories(vendor/twitcurl/libtwitcurl) 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}) -else (YamlCpp_FOUND AND CURL_FOUND) + target_link_libraries(rawr-ebooks ${YamlCpp_LIBRARIES} twitcurl ${Curl_LIBRARIES}) +else (YamlCpp_FOUND AND 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 (YamlCpp_FOUND AND 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