From 7f5653486abe14d34e57f27249f06fa1af3ad07d Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Wed, 9 Mar 2016 10:25:35 -0500 Subject: Added yaml-cpp as a submodule --- .gitmodules | 3 +++ CMakeLists.txt | 7 ++++--- vendor/yaml-cpp | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) create mode 160000 vendor/yaml-cpp diff --git a/.gitmodules b/.gitmodules index 037e2c6..581c545 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,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 307a777..2150374 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,12 +7,13 @@ add_subdirectory(vendor/twitcurl/libtwitcurl) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") -find_package(PkgConfig) -pkg_check_modules(YamlCpp yaml-cpp REQUIRED) find_package(Mysql REQUIRED) +add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) +include_directories(vendor/yaml-cpp/include) + include_directories(vendor/twitcurl/libtwitcurl ${MYSQL_INCLUDE_DIR}) add_executable(nancy nancy.cpp) set_property(TARGET nancy PROPERTY CXX_STANDARD 11) set_property(TARGET nancy PROPERTY CXX_STANDARD_REQUIRED ON) -target_link_libraries(nancy ${YamlCpp_LIBRARIES} ${MYSQL_LIBRARIES} twitcurl curl) +target_link_libraries(nancy yaml-cpp ${MYSQL_LIBRARIES} twitcurl curl) diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp new file mode 160000 index 0000000..57805df --- /dev/null +++ b/vendor/yaml-cpp @@ -0,0 +1 @@ +Subproject commit 57805dfd6a741e55477ea8d4d5b3b6f0272d1f0e -- cgit 1.4.1