From 07a11ffc6a1d23815bca45321afa0f3c8661d96d Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Mon, 26 Mar 2018 15:36:13 -0400 Subject: Removed yaml-cpp submodule --- .gitignore | 1 - .gitmodules | 3 --- CMakeLists.txt | 10 +++++++--- vendor/yaml-cpp | 1 - 4 files changed, 7 insertions(+), 8 deletions(-) delete mode 160000 vendor/yaml-cpp diff --git a/.gitignore b/.gitignore index ff2534f..85f0eb9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ CMakeCache.txt CMakeFiles Makefile cmake_install.cmake -yaml-cpp.pc config.yml data.sqlite3 forms.txt diff --git a/.gitmodules b/.gitmodules index 8544219..e1d506f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "vendor/libtwittercpp"] path = vendor/libtwittercpp url = https://github.com/hatkirby/libtwittercpp -[submodule "vendor/yaml-cpp"] - path = vendor/yaml-cpp - url = https://github.com/jbeder/yaml-cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 65cfef7..4345e90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,12 +3,16 @@ project (cadence) find_package(PkgConfig) pkg_check_modules(sqlite3 sqlite3 REQUIRED) +pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) add_subdirectory(vendor/libtwittercpp) -add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) -include_directories(${sqlite3_INCLUDE_DIR} vendor/libtwittercpp/src vendor/yaml-cpp/include) +include_directories( + ${sqlite3_INCLUDE_DIR} + vendor/libtwittercpp/src + ${yaml-cpp_INCLUDE_DIRS}) + add_executable(cadence cadence.cpp) set_property(TARGET cadence PROPERTY CXX_STANDARD 11) set_property(TARGET cadence PROPERTY CXX_STANDARD_REQUIRED ON) -target_link_libraries(cadence ${sqlite3_LIBRARIES} twitter++ yaml-cpp) +target_link_libraries(cadence ${sqlite3_LIBRARIES} twitter++ ${yaml-cpp_LIBRARIES}) diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 index 86c69bb..0000000 --- a/vendor/yaml-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 86c69bb73c497bd127afd9802d0aef8ba160f9c6 -- cgit 1.4.1