From abd320d920292daa7d44d95173bcf5eeac0ce9a2 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 10 Jan 2021 11:01:43 -0500 Subject: Removed yaml-cpp submodule --- .gitmodules | 3 --- CMakeLists.txt | 13 ++++++++++--- vendor/yaml-cpp | 1 - 3 files changed, 10 insertions(+), 7 deletions(-) delete mode 160000 vendor/yaml-cpp diff --git a/.gitmodules b/.gitmodules index 79dde9f..6fecb3f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,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 805e684..d5520bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,19 @@ cmake_minimum_required (VERSION 3.1) project (owo) +find_package(PkgConfig) +pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) + add_subdirectory(vendor/verbly) add_subdirectory(vendor/libtwittercpp) -add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) -include_directories(vendor/verbly/lib vendor/libtwittercpp/src vendor/yaml-cpp/include) +include_directories( + vendor/verbly/lib + vendor/libtwittercpp/src + ${yaml-cpp_INCLUDE_DIRS}) + add_executable(owo owo.cpp) set_property(TARGET owo PROPERTY CXX_STANDARD 11) set_property(TARGET owo PROPERTY CXX_STANDARD_REQUIRED ON) -target_link_libraries(owo verbly twitter++ yaml-cpp) + +target_link_libraries(owo verbly twitter++ ${yaml-cpp_LIBRARIES}) diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 index b5b03bb..0000000 --- a/vendor/yaml-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b5b03bb9ad6325f844314e397fb3f1b1c58eeeff -- cgit 1.4.1