From aa9a3d2e3b1cad0ad26efd84a353fc2c8b5ea89c Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Tue, 29 Mar 2016 11:02:00 -0400 Subject: Added yaml-cpp as a submodule --- .gitmodules | 3 +++ CMakeLists.txt | 14 +++++++------- vendor/yaml-cpp | 1 + 3 files changed, 11 insertions(+), 7 deletions(-) create mode 160000 vendor/yaml-cpp diff --git a/.gitmodules b/.gitmodules index 16192d6..08a42de 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "vendor/twitcurl"] path = vendor/twitcurl url = https://github.com/swatkat/twitcurl +[submodule "vendor/yaml-cpp"] + path = vendor/yaml-cpp + 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 @@ -cmake_minimum_required (VERSION 2.6) +cmake_minimum_required (VERSION 3.1) project (blessed) -add_subdirectory(vendor/twitcurl/libtwitcurl) -add_subdirectory(vendor/verbly) - find_package(PkgConfig) -pkg_check_modules(YamlCpp yaml-cpp REQUIRED) pkg_check_modules(sqlite3 sqlite3 REQUIRED) -include_directories(vendor/twitcurl/libtwitcurl ${sqlite3_INCLUDE_DIR} vendor/verbly/lib) +add_subdirectory(vendor/twitcurl/libtwitcurl) +add_subdirectory(vendor/verbly) +add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) + +include_directories(vendor/twitcurl/libtwitcurl ${sqlite3_INCLUDE_DIR} vendor/verbly/lib vendor/yaml-cpp/include) add_executable(blessed blessed.cpp) set_property(TARGET blessed PROPERTY CXX_STANDARD 11) set_property(TARGET blessed PROPERTY CXX_STANDARD_REQUIRED ON) -target_link_libraries(blessed ${sqlite3_LIBRARIES} ${YamlCpp_LIBRARIES} twitcurl curl verbly) +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 index 0000000..34bd1a7 --- /dev/null +++ b/vendor/yaml-cpp @@ -0,0 +1 @@ +Subproject commit 34bd1a7083e5875e6a4b2d4f61c0b356cc5d53fc -- cgit 1.4.1