From 932872ad17dd0fe86bd8c30f8165e4d0fc0cd5ee Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Thu, 25 Jan 2018 12:12:50 -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 adb9ba1..e444b73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,13 +3,19 @@ project (difference) add_subdirectory(vendor/libtwittercpp) add_subdirectory(vendor/verbly) -add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) find_package(PkgConfig) pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) +pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) + +include_directories( + vendor/libtwittercpp/src + vendor/libtwittercpp/vendor/curlcpp/include + vendor/verbly/lib + ${GraphicsMagick_INCLUDE_DIRS} + ${yaml-cpp_INCLUDE_DIRS}) -include_directories(vendor/libtwittercpp/src vendor/libtwittercpp/vendor/curlcpp/include vendor/verbly/lib ${GraphicsMagick_INCLUDE_DIRS} vendor/yaml-cpp/include) add_executable(difference difference.cpp main.cpp) set_property(TARGET difference PROPERTY CXX_STANDARD 11) set_property(TARGET difference PROPERTY CXX_STANDARD_REQUIRED ON) -target_link_libraries(difference verbly yaml-cpp twitter++ ${GraphicsMagick_LIBRARIES}) +target_link_libraries(difference verbly ${yaml-cpp_LIBRARIES} twitter++ ${GraphicsMagick_LIBRARIES}) diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 index 7d2873c..0000000 --- a/vendor/yaml-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7d2873ce9f2202ea21b6a8c5ecbc9fe38032c229 -- cgit 1.4.1