From bd018c38b3c2715be8f95ac2d07ca070ded7cc6d Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Tue, 19 Dec 2017 12:45:48 -0500 Subject: Removed yaml-cpp submodule Project now links against a local installation of yaml-cpp. --- .gitmodules | 3 --- CMakeLists.txt | 13 ++++++++++--- vendor/yaml-cpp | 1 - 3 files changed, 10 insertions(+), 7 deletions(-) delete mode 160000 vendor/yaml-cpp diff --git a/.gitmodules b/.gitmodules index b8daec7..176dfe3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "vendor/libtwittercpp"] path = vendor/libtwittercpp url = git@github.com:hatkirby/libtwittercpp.git -[submodule "vendor/yaml-cpp"] - path = vendor/yaml-cpp - url = git@github.com:jbeder/yaml-cpp.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 0462950..c0f8b15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,14 +3,21 @@ project (capital) 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( + ${GraphicsMagick_INCLUDE_DIRS} + vendor/verbly/lib + vendor/libtwittercpp/src + ${yaml-cpp_INCLUDE_DIRS} + vendor/libtwittercpp/vendor/curlcpp/include) -include_directories(${GraphicsMagick_INCLUDE_DIRS} vendor/verbly/lib vendor/libtwittercpp/src vendor/yaml-cpp/include vendor/libtwittercpp/vendor/curlcpp/include) link_directories(${GraphicsMagick_LIBRARY_DIRS}) + add_executable(capital capital.cpp main.cpp) set_property(TARGET capital PROPERTY CXX_STANDARD 11) set_property(TARGET capital PROPERTY CXX_STANDARD_REQUIRED ON) -target_link_libraries(capital ${GraphicsMagick_LIBRARIES} verbly yaml-cpp twitter++) +target_link_libraries(capital ${GraphicsMagick_LIBRARIES} verbly ${yaml-cpp_LIBRARIES} twitter++) diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 index beb44b8..0000000 --- a/vendor/yaml-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit beb44b872c07c74556314e730c6f20a00b32e8e5 -- cgit 1.4.1