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. --- CMakeLists.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') 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++) -- cgit 1.4.1