From f0ed0ab7d97a14734762d0b7f512e7a9895b3195 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Wed, 20 Dec 2017 16:09:49 -0500 Subject: Removed yaml-cpp submodule Project now links against a local installation of yaml-cpp. --- .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 3ac2123..9a07567 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 82fcc44..fe7fd64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,18 @@ cmake_minimum_required (VERSION 3.1) project (wordplay) +find_package(PkgConfig) +pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) + add_subdirectory(vendor/libtwittercpp) -add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) add_subdirectory(vendor/verbly) -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(wordplay wordplay.cpp) set_property(TARGET wordplay PROPERTY CXX_STANDARD 11) set_property(TARGET wordplay PROPERTY CXX_STANDARD_REQUIRED ON) -target_link_libraries(wordplay verbly twitter++ yaml-cpp) +target_link_libraries(wordplay verbly twitter++ ${yaml-cpp_LIBRARIES}) diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 index 57805df..0000000 --- a/vendor/yaml-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 57805dfd6a741e55477ea8d4d5b3b6f0272d1f0e -- cgit 1.4.1