diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2016-03-29 10:50:56 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2016-03-29 10:50:56 -0400 |
| commit | 44b272fa0c8d1ee29088d383605104227f3a224d (patch) | |
| tree | 7383b9fa6db31876107085a6e5817a0f20d33bf5 | |
| parent | e3f781349f460f24dfdbd2a7908bfa8f46945c46 (diff) | |
| download | furries-44b272fa0c8d1ee29088d383605104227f3a224d.tar.gz furries-44b272fa0c8d1ee29088d383605104227f3a224d.tar.bz2 furries-44b272fa0c8d1ee29088d383605104227f3a224d.zip | |
Added yaml-cpp as a submodule
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| m--------- | vendor/yaml-cpp | 0 |
3 files changed, 10 insertions, 7 deletions
| diff --git a/.gitmodules b/.gitmodules index d627b76..ad942bc 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -4,3 +4,6 @@ | |||
| 4 | [submodule "vendor/verbly"] | 4 | [submodule "vendor/verbly"] |
| 5 | path = vendor/verbly | 5 | path = vendor/verbly |
| 6 | url = https://github.com/hatkirby/verbly | 6 | url = https://github.com/hatkirby/verbly |
| 7 | [submodule "vendor/yaml-cpp"] | ||
| 8 | path = vendor/yaml-cpp | ||
| 9 | url = https://github.com/jbeder/yaml-cpp | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ceeb80..266c9d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -1,15 +1,15 @@ | |||
| 1 | cmake_minimum_required (VERSION 2.6) | 1 | cmake_minimum_required (VERSION 3.1) |
| 2 | project (furries) | 2 | project (furries) |
| 3 | 3 | ||
| 4 | add_subdirectory(vendor/twitcurl/libtwitcurl) | ||
| 5 | add_subdirectory(vendor/verbly) | ||
| 6 | |||
| 7 | find_package(PkgConfig) | 4 | find_package(PkgConfig) |
| 8 | pkg_check_modules(YamlCpp yaml-cpp REQUIRED) | ||
| 9 | pkg_check_modules(sqlite3 sqlite3 REQUIRED) | 5 | pkg_check_modules(sqlite3 sqlite3 REQUIRED) |
| 10 | 6 | ||
| 11 | include_directories(vendor/twitcurl/libtwitcurl ${sqlite3_INCLUDE_DIR} vendor/verbly/lib) | 7 | add_subdirectory(vendor/twitcurl/libtwitcurl) |
| 8 | add_subdirectory(vendor/verbly) | ||
| 9 | add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) | ||
| 10 | |||
| 11 | include_directories(vendor/twitcurl/libtwitcurl ${sqlite3_INCLUDE_DIR} vendor/verbly/lib vendor/yaml-cpp/include) | ||
| 12 | add_executable(furries furries.cpp) | 12 | add_executable(furries furries.cpp) |
| 13 | set_property(TARGET furries PROPERTY CXX_STANDARD 11) | 13 | set_property(TARGET furries PROPERTY CXX_STANDARD 11) |
| 14 | set_property(TARGET furries PROPERTY CXX_STANDARD_REQUIRED ON) | 14 | set_property(TARGET furries PROPERTY CXX_STANDARD_REQUIRED ON) |
| 15 | target_link_libraries(furries verbly ${sqlite3_LIBRARIES} ${YamlCpp_LIBRARIES} twitcurl curl) | 15 | target_link_libraries(furries verbly ${sqlite3_LIBRARIES} yaml-cpp twitcurl curl) |
| diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp new file mode 160000 | |||
| Subproject 34bd1a7083e5875e6a4b2d4f61c0b356cc5d53f | |||