From cf2323aa9ead54b05b8d0e04cef2bb7a5d0beba0 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 25 Mar 2018 17:48:13 -0400 Subject: Removed yaml-cpp submodule --- .gitmodules | 3 --- CMakeLists.txt | 11 ++++++++--- vendor/yaml-cpp | 1 - 3 files changed, 8 insertions(+), 7 deletions(-) delete mode 160000 vendor/yaml-cpp 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 df9ccfe..bd250a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,10 +2,15 @@ cmake_minimum_required (VERSION 3.1) project (toldya) add_subdirectory(vendor/libtwittercpp) -add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) -include_directories(vendor/libtwittercpp/src vendor/yaml-cpp/include) +find_package(PkgConfig) +pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) + +include_directories( + vendor/libtwittercpp/src + ${yaml-cpp_INCLUDE_DIRS}) + add_executable(toldya toldya.cpp) set_property(TARGET toldya PROPERTY CXX_STANDARD 11) set_property(TARGET toldya PROPERTY CXX_STANDARD_REQUIRED ON) -target_link_libraries(toldya yaml-cpp twitter++) +target_link_libraries(toldya ${yaml-cpp_LIBRARIES} twitter++) diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 index 728e26e..0000000 --- a/vendor/yaml-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 728e26e42645d4d70ca65522990f915f47b47a50 -- cgit 1.4.1