From 9acf1f0ee0859125de4136e36f40f550a45e26ff Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Fri, 23 Feb 2018 11:05:17 -0500 Subject: Removed yaml-cpp submodule Project now links against a local installation of yaml-cpp. --- .gitmodules | 6 ------ CMakeLists.txt | 12 +++++++++--- vendor/yaml-cpp | 1 - 3 files changed, 9 insertions(+), 10 deletions(-) delete mode 160000 vendor/yaml-cpp diff --git a/.gitmodules b/.gitmodules index 2d58700..6fecb3f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,6 @@ [submodule "vendor/verbly"] path = vendor/verbly url = https://github.com/hatkirby/verbly -[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 [submodule "vendor/libtwittercpp"] path = vendor/libtwittercpp url = https://github.com/hatkirby/libtwittercpp diff --git a/CMakeLists.txt b/CMakeLists.txt index b9a143f..1a7a4c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,11 +2,17 @@ cmake_minimum_required (VERSION 3.1) project (insult) add_subdirectory(vendor/verbly) -add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) add_subdirectory(vendor/libtwittercpp) -include_directories(vendor/verbly/lib vendor/yaml-cpp/include vendor/libtwittercpp/src) +find_package(PkgConfig) +pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) + +include_directories( + vendor/verbly/lib + ${yaml-cpp_INCLUDE_DIRS} + vendor/libtwittercpp/src) + add_executable(insult insult.cpp patterner.cpp) set_property(TARGET insult PROPERTY CXX_STANDARD 11) set_property(TARGET insult PROPERTY CXX_STANDARD_REQUIRED ON) -target_link_libraries(insult verbly twitter++ yaml-cpp) +target_link_libraries(insult 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