From 759c2857643b5be84238faa6e4c99fe479ca3056 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sat, 4 Aug 2018 23:11:25 -0400 Subject: Removed yaml-cpp submodule --- .gitmodules | 3 --- CMakeLists.txt | 12 +++++++++--- vendor/yaml-cpp | 1 - 3 files changed, 9 insertions(+), 7 deletions(-) delete mode 160000 vendor/yaml-cpp diff --git a/.gitmodules b/.gitmodules index 79aa7f0..6fecb3f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "vendor/verbly"] path = vendor/verbly url = https://github.com/hatkirby/verbly -[submodule "vendor/yaml-cpp"] - path = vendor/yaml-cpp - url = https://github.com/jbeder/yaml-cpp [submodule "vendor/libtwittercpp"] path = vendor/libtwittercpp url = https://github.com/hatkirby/libtwittercpp diff --git a/CMakeLists.txt b/CMakeLists.txt index cbc9e68..8910548 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,10 +3,16 @@ project (furries) add_subdirectory(vendor/libtwittercpp) add_subdirectory(vendor/verbly) -add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) -include_directories(vendor/libtwittercpp/src vendor/verbly/lib vendor/yaml-cpp/include) +find_package(PkgConfig) +pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) + +include_directories( + vendor/libtwittercpp/src + vendor/verbly/lib + ${yaml-cpp_INCLUDE_DIRS}) + add_executable(furries furries.cpp sentence.cpp) set_property(TARGET furries PROPERTY CXX_STANDARD 11) set_property(TARGET furries PROPERTY CXX_STANDARD_REQUIRED ON) -target_link_libraries(furries verbly twitter++ yaml-cpp) +target_link_libraries(furries verbly twitter++ ${yaml-cpp_LIBRARIES}) diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 index 34bd1a7..0000000 --- a/vendor/yaml-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 34bd1a7083e5875e6a4b2d4f61c0b356cc5d53fc -- cgit 1.4.1