diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2016-03-29 11:02:00 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2016-03-29 11:02:00 -0400 |
| commit | aa9a3d2e3b1cad0ad26efd84a353fc2c8b5ea89c (patch) | |
| tree | b417b3e386a863f23c8ee9aa77826c2aa3e54ea5 | |
| parent | 8e763a23b29a4af6b11bb3be80c7c1d890e77fce (diff) | |
| download | blessed-aa9a3d2e3b1cad0ad26efd84a353fc2c8b5ea89c.tar.gz blessed-aa9a3d2e3b1cad0ad26efd84a353fc2c8b5ea89c.tar.bz2 blessed-aa9a3d2e3b1cad0ad26efd84a353fc2c8b5ea89c.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 16192d6..08a42de 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -4,3 +4,6 @@ | |||
| 4 | [submodule "vendor/twitcurl"] | 4 | [submodule "vendor/twitcurl"] |
| 5 | path = vendor/twitcurl | 5 | path = vendor/twitcurl |
| 6 | url = https://github.com/swatkat/twitcurl | 6 | url = https://github.com/swatkat/twitcurl |
| 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 872dbe3..be6cc89 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 (blessed) | 2 | project (blessed) |
| 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(blessed blessed.cpp) | 12 | add_executable(blessed blessed.cpp) |
| 13 | set_property(TARGET blessed PROPERTY CXX_STANDARD 11) | 13 | set_property(TARGET blessed PROPERTY CXX_STANDARD 11) |
| 14 | set_property(TARGET blessed PROPERTY CXX_STANDARD_REQUIRED ON) | 14 | set_property(TARGET blessed PROPERTY CXX_STANDARD_REQUIRED ON) |
| 15 | target_link_libraries(blessed ${sqlite3_LIBRARIES} ${YamlCpp_LIBRARIES} twitcurl curl verbly) | 15 | target_link_libraries(blessed ${sqlite3_LIBRARIES} yaml-cpp twitcurl curl verbly) |
| diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp new file mode 160000 | |||
| Subproject 34bd1a7083e5875e6a4b2d4f61c0b356cc5d53f | |||