From 1dc76691f3e1c982973a03a9988b98713b9631ae Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Tue, 19 Jun 2018 19:13:34 -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 f4b3cdf..2d9ee1e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "vendor/verbly"] path = vendor/verbly url = git@github.com:hatkirby/verbly -[submodule "vendor/yaml-cpp"] - path = vendor/yaml-cpp - url = git@github.com:jbeder/yaml-cpp [submodule "vendor/libtwittercpp"] path = vendor/libtwittercpp url = git@github.com:hatkirby/libtwittercpp diff --git a/CMakeLists.txt b/CMakeLists.txt index f7c21c5..c95e6aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,18 @@ cmake_minimum_required (VERSION 3.1) project (fefisms) +find_package(PkgConfig) +pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) + 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) +include_directories( + vendor/libtwittercpp/src + vendor/verbly/lib + ${yaml-cpp_INCLUDE_DIRS}) + add_executable(fefisms fefisms.cpp main.cpp) set_property(TARGET fefisms PROPERTY CXX_STANDARD 11) set_property(TARGET fefisms PROPERTY CXX_STANDARD_REQUIRED ON) -target_link_libraries(fefisms verbly twitter++ yaml-cpp) +target_link_libraries(fefisms verbly twitter++ ${yaml-cpp_LIBRARIES}) diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 index bedb28f..0000000 --- a/vendor/yaml-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bedb28fdb4fd52d97e02f6cb946cae631037089e -- cgit 1.4.1