diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2016-02-01 09:37:46 -0500 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2016-02-01 09:37:46 -0500 |
| commit | 8be8513a29b277d7919c3033840611ce25b213ce (patch) | |
| tree | a8b581ac72c5ac3ad3d7f92b958c7578c60acbdf | |
| parent | 617155fe562652c859a380d85cc5710783d79448 (diff) | |
| download | rawr-ebooks-8be8513a29b277d7919c3033840611ce25b213ce.tar.gz rawr-ebooks-8be8513a29b277d7919c3033840611ce25b213ce.tar.bz2 rawr-ebooks-8be8513a29b277d7919c3033840611ce25b213ce.zip | |
Switched to pkg-config for finding libcurl
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
| 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) | |||
| 3 | 3 | ||
| 4 | find_package(PkgConfig) | 4 | find_package(PkgConfig) |
| 5 | pkg_check_modules(YamlCpp yaml-cpp) | 5 | pkg_check_modules(YamlCpp yaml-cpp) |
| 6 | find_package(curl) | 6 | pkg_check_modules(Curl libcurl) |
| 7 | 7 | ||
| 8 | if (YamlCpp_FOUND AND CURL_FOUND) | 8 | if (YamlCpp_FOUND AND Curl_FOUND) |
| 9 | add_subdirectory(vendor/twitcurl/libtwitcurl) | 9 | add_subdirectory(vendor/twitcurl/libtwitcurl) |
| 10 | include_directories(vendor/twitcurl/libtwitcurl) | 10 | include_directories(vendor/twitcurl/libtwitcurl) |
| 11 | add_executable(rawr-ebooks ebooks.cpp kgramstats.cpp freevars.cpp histogram.cpp prefix_search.cpp) | 11 | add_executable(rawr-ebooks ebooks.cpp kgramstats.cpp freevars.cpp histogram.cpp prefix_search.cpp) |
| 12 | set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD 11) | 12 | set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD 11) |
| 13 | set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD_REQUIRED ON) | 13 | set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD_REQUIRED ON) |
| 14 | target_link_libraries(rawr-ebooks ${YamlCpp_LIBRARIES} twitcurl ${CURL_LIBRARIES}) | 14 | target_link_libraries(rawr-ebooks ${YamlCpp_LIBRARIES} twitcurl ${Curl_LIBRARIES}) |
| 15 | else (YamlCpp_FOUND AND CURL_FOUND) | 15 | else (YamlCpp_FOUND AND Curl_FOUND) |
| 16 | message(STATUS "rawr-ebooks requires yaml-cpp and twitcurl; without these, we will only make rawr-gen") | 16 | message(STATUS "rawr-ebooks requires yaml-cpp and twitcurl; without these, we will only make rawr-gen") |
| 17 | endif (YamlCpp_FOUND AND CURL_FOUND) | 17 | endif (YamlCpp_FOUND AND Curl_FOUND) |
| 18 | 18 | ||
| 19 | add_executable(rawr-gen gen.cpp kgramstats.cpp freevars.cpp histogram.cpp prefix_search.cpp) | 19 | add_executable(rawr-gen gen.cpp kgramstats.cpp freevars.cpp histogram.cpp prefix_search.cpp) |
| 20 | set_property(TARGET rawr-gen PROPERTY CXX_STANDARD 11) | 20 | set_property(TARGET rawr-gen PROPERTY CXX_STANDARD 11) |