about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt13
m---------vendor/yaml-cpp0
3 files changed, 11 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index 037e2c6..581c545 100644 --- a/.gitmodules +++ b/.gitmodules
@@ -1,3 +1,6 @@
1[submodule "vendor/twitcurl"] 1[submodule "vendor/twitcurl"]
2 path = vendor/twitcurl 2 path = vendor/twitcurl
3 url = https://github.com/swatkat/twitcurl 3 url = https://github.com/swatkat/twitcurl
4[submodule "vendor/yaml-cpp"]
5 path = vendor/yaml-cpp
6 url = https://github.com/jbeder/yaml-cpp
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)
2project (rawr-ebooks) 2project (rawr-ebooks)
3 3
4find_package(PkgConfig) 4find_package(PkgConfig)
5pkg_check_modules(YamlCpp yaml-cpp)
6pkg_check_modules(Curl libcurl) 5pkg_check_modules(Curl libcurl)
7 6
8if (YamlCpp_FOUND AND Curl_FOUND) 7if (Curl_FOUND)
9 add_subdirectory(vendor/twitcurl/libtwitcurl) 8 add_subdirectory(vendor/twitcurl/libtwitcurl)
10 include_directories(vendor/twitcurl/libtwitcurl) 9 include_directories(vendor/twitcurl/libtwitcurl)
10
11 add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
12 include_directories(vendor/yaml-cpp/include)
13
11 add_executable(rawr-ebooks ebooks.cpp kgramstats.cpp freevars.cpp histogram.cpp prefix_search.cpp) 14 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) 15 set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD 11)
13 set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD_REQUIRED ON) 16 set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD_REQUIRED ON)
14 target_link_libraries(rawr-ebooks ${YamlCpp_LIBRARIES} twitcurl ${Curl_LIBRARIES} aspell) 17 target_link_libraries(rawr-ebooks yaml-cpp twitcurl ${Curl_LIBRARIES} aspell)
15else (YamlCpp_FOUND AND Curl_FOUND) 18else (Curl_FOUND)
16 message(STATUS "rawr-ebooks requires yaml-cpp and twitcurl; without these, we will only make rawr-gen") 19 message(STATUS "rawr-ebooks requires yaml-cpp and twitcurl; without these, we will only make rawr-gen")
17endif (YamlCpp_FOUND AND Curl_FOUND) 20endif (Curl_FOUND)
18 21
19add_executable(rawr-gen gen.cpp kgramstats.cpp freevars.cpp histogram.cpp prefix_search.cpp) 22add_executable(rawr-gen gen.cpp kgramstats.cpp freevars.cpp histogram.cpp prefix_search.cpp)
20set_property(TARGET rawr-gen PROPERTY CXX_STANDARD 11) 23set_property(TARGET rawr-gen PROPERTY CXX_STANDARD 11)
diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp new file mode 160000
Subproject 57805dfd6a741e55477ea8d4d5b3b6f0272d1f0