diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2016-02-28 18:21:01 -0500 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2016-02-28 18:21:01 -0500 |
| commit | 717e6c62020f2408c3a72ab87e0cba410acc17e4 (patch) | |
| tree | ecba36d6d392e5fe61ff982ccba7e81e8cfae745 | |
| parent | b228eb802b3c468bc7a7b905a0b771ba24679bab (diff) | |
| download | rawr-ebooks-717e6c62020f2408c3a72ab87e0cba410acc17e4.tar.gz rawr-ebooks-717e6c62020f2408c3a72ab87e0cba410acc17e4.tar.bz2 rawr-ebooks-717e6c62020f2408c3a72ab87e0cba410acc17e4.zip | |
Added yaml-cpp as a vendor submodule
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 13 | ||||
| m--------- | vendor/yaml-cpp | 0 |
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) | |||
| 2 | project (rawr-ebooks) | 2 | project (rawr-ebooks) |
| 3 | 3 | ||
| 4 | find_package(PkgConfig) | 4 | find_package(PkgConfig) |
| 5 | pkg_check_modules(YamlCpp yaml-cpp) | ||
| 6 | pkg_check_modules(Curl libcurl) | 5 | pkg_check_modules(Curl libcurl) |
| 7 | 6 | ||
| 8 | if (YamlCpp_FOUND AND Curl_FOUND) | 7 | if (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) |
| 15 | else (YamlCpp_FOUND AND Curl_FOUND) | 18 | else (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") |
| 17 | endif (YamlCpp_FOUND AND Curl_FOUND) | 20 | endif (Curl_FOUND) |
| 18 | 21 | ||
| 19 | add_executable(rawr-gen gen.cpp kgramstats.cpp freevars.cpp histogram.cpp prefix_search.cpp) | 22 | 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) | 23 | set_property(TARGET rawr-gen PROPERTY CXX_STANDARD 11) |
| diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp new file mode 160000 | |||
| Subproject 57805dfd6a741e55477ea8d4d5b3b6f0272d1f0 | |||