From 8b29ce316f6a4b544057d378bf4e6cbc859b63f8 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Fri, 15 Apr 2016 18:26:53 -0400 Subject: Added yaml-cpp submodule --- .gitmodules | 3 +++ CMakeLists.txt | 6 +++--- vendor/libtwittercpp | 2 +- vendor/yaml-cpp | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) create mode 160000 vendor/yaml-cpp diff --git a/.gitmodules b/.gitmodules index 6c14770..36738fe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "vendor/curlcpp"] path = vendor/curlcpp url = https://github.com/JosephP91/curlcpp +[submodule "vendor/yaml-cpp"] + path = vendor/yaml-cpp + 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) add_subdirectory(vendor/libtwittercpp) add_subdirectory(vendor/verbly) +add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) find_package(PkgConfig) -pkg_check_modules(YamlCpp yaml-cpp REQUIRED) pkg_check_modules(sqlite3 sqlite3 REQUIRED) pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) -include_directories(vendor/libtwittercpp/src ${sqlite3_INCLUDE_DIR} vendor/verbly/lib vendor/curlcpp/include ${GraphicsMagick_INCLUDE_DIRS} vendor/libtwittercpp/vendor/json/src) +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) add_executable(difference difference.cpp) set_property(TARGET difference PROPERTY CXX_STANDARD 11) set_property(TARGET difference PROPERTY CXX_STANDARD_REQUIRED ON) -target_link_libraries(difference verbly ${sqlite3_LIBRARIES} ${YamlCpp_LIBRARIES} twitter++ curlcpp ${GraphicsMagick_LIBRARIES}) +target_link_libraries(difference verbly ${sqlite3_LIBRARIES} yaml-cpp twitter++ curlcpp ${GraphicsMagick_LIBRARIES}) diff --git a/vendor/libtwittercpp b/vendor/libtwittercpp index 7e85b35..b276d01 160000 --- a/vendor/libtwittercpp +++ b/vendor/libtwittercpp @@ -1 +1 @@ -Subproject commit 7e85b35d7d1714e3f85434b891a1050ad584e337 +Subproject commit b276d016ee4b4125616f1f873ce32a9ce3317bb3 diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp new file mode 160000 index 0000000..7d2873c --- /dev/null +++ b/vendor/yaml-cpp @@ -0,0 +1 @@ +Subproject commit 7d2873ce9f2202ea21b6a8c5ecbc9fe38032c229 -- cgit 1.4.1