diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2016-04-15 18:26:53 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2016-04-15 18:26:53 -0400 |
| commit | 8b29ce316f6a4b544057d378bf4e6cbc859b63f8 (patch) | |
| tree | d4e4bd2996d48977509e6ff7b3dbc8b06bd7eb75 | |
| parent | 9d021d0ef0e24595cd35e42d2847a6e679c386e0 (diff) | |
| download | difference-8b29ce316f6a4b544057d378bf4e6cbc859b63f8.tar.gz difference-8b29ce316f6a4b544057d378bf4e6cbc859b63f8.tar.bz2 difference-8b29ce316f6a4b544057d378bf4e6cbc859b63f8.zip | |
Added yaml-cpp submodule
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| m--------- | vendor/libtwittercpp | 0 | ||||
| m--------- | vendor/yaml-cpp | 0 |
4 files changed, 6 insertions, 3 deletions
| diff --git a/.gitmodules b/.gitmodules index 6c14770..36738fe 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -7,3 +7,6 @@ | |||
| 7 | [submodule "vendor/curlcpp"] | 7 | [submodule "vendor/curlcpp"] |
| 8 | path = vendor/curlcpp | 8 | path = vendor/curlcpp |
| 9 | url = https://github.com/JosephP91/curlcpp | 9 | url = https://github.com/JosephP91/curlcpp |
| 10 | [submodule "vendor/yaml-cpp"] | ||
| 11 | path = vendor/yaml-cpp | ||
| 12 | url = https://github.com/jbeder/yaml-cpp | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt index da4306f..3b5e33c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -5,14 +5,14 @@ set(CMAKE_BUILD_TYPE Debug) | |||
| 5 | 5 | ||
| 6 | add_subdirectory(vendor/libtwittercpp) | 6 | add_subdirectory(vendor/libtwittercpp) |
| 7 | add_subdirectory(vendor/verbly) | 7 | add_subdirectory(vendor/verbly) |
| 8 | add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) | ||
| 8 | 9 | ||
| 9 | find_package(PkgConfig) | 10 | find_package(PkgConfig) |
| 10 | pkg_check_modules(YamlCpp yaml-cpp REQUIRED) | ||
| 11 | pkg_check_modules(sqlite3 sqlite3 REQUIRED) | 11 | pkg_check_modules(sqlite3 sqlite3 REQUIRED) |
| 12 | pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) | 12 | pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) |
| 13 | 13 | ||
| 14 | include_directories(vendor/libtwittercpp/src ${sqlite3_INCLUDE_DIR} vendor/verbly/lib vendor/curlcpp/include ${GraphicsMagick_INCLUDE_DIRS} vendor/libtwittercpp/vendor/json/src) | 14 | include_directories(vendor/libtwittercpp/src ${sqlite3_INCLUDE_DIR} vendor/verbly/lib vendor/curlcpp/include ${GraphicsMagick_INCLUDE_DIRS} vendor/libtwittercpp/vendor/json/src vendor/yaml-cpp/include) |
| 15 | add_executable(difference difference.cpp) | 15 | add_executable(difference difference.cpp) |
| 16 | set_property(TARGET difference PROPERTY CXX_STANDARD 11) | 16 | set_property(TARGET difference PROPERTY CXX_STANDARD 11) |
| 17 | set_property(TARGET difference PROPERTY CXX_STANDARD_REQUIRED ON) | 17 | set_property(TARGET difference PROPERTY CXX_STANDARD_REQUIRED ON) |
| 18 | target_link_libraries(difference verbly ${sqlite3_LIBRARIES} ${YamlCpp_LIBRARIES} twitter++ curlcpp ${GraphicsMagick_LIBRARIES}) | 18 | target_link_libraries(difference verbly ${sqlite3_LIBRARIES} yaml-cpp twitter++ curlcpp ${GraphicsMagick_LIBRARIES}) |
| diff --git a/vendor/libtwittercpp b/vendor/libtwittercpp | |||
| Subproject 7e85b35d7d1714e3f85434b891a1050ad584e33 | Subproject b276d016ee4b4125616f1f873ce32a9ce3317bb | ||
| diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp new file mode 160000 | |||
| Subproject 7d2873ce9f2202ea21b6a8c5ecbc9fe38032c22 | |||