From adc3efe6a834ae04194ff3637aaadb71880b5c21 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Tue, 19 Dec 2017 12:35:51 -0500 Subject: Removed yaml-cpp submodule Project now links against a local installation of yaml-cpp. --- .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 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 5fc053d..837eb8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,13 +5,19 @@ set(CMAKE_BUILD_TYPE Debug) find_package(PkgConfig) pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) +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/libtwittercpp/vendor/curlcpp/include ${GraphicsMagick_INCLUDE_DIRS} vendor/yaml-cpp/include) +include_directories( + vendor/verbly/lib + vendor/libtwittercpp/src + vendor/libtwittercpp/vendor/curlcpp/include + ${GraphicsMagick_INCLUDE_DIRS} + ${yaml-cpp_INCLUDE_DIRS}) + add_executable(advice main.cpp advice.cpp sentence.cpp) set_property(TARGET advice PROPERTY CXX_STANDARD 11) set_property(TARGET advice PROPERTY CXX_STANDARD_REQUIRED ON) -target_link_libraries(advice verbly twitter++ ${GraphicsMagick_LIBRARIES} yaml-cpp) +target_link_libraries(advice verbly twitter++ ${GraphicsMagick_LIBRARIES} ${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