diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-12-19 12:35:51 -0500 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-12-19 12:35:51 -0500 |
| commit | adc3efe6a834ae04194ff3637aaadb71880b5c21 (patch) | |
| tree | d3e290e3d3b6b2487206c4c35344a97620b3c14b | |
| parent | acba5923a5a4df59239a9b33d2b280709fafa9ae (diff) | |
| download | advice-adc3efe6a834ae04194ff3637aaadb71880b5c21.tar.gz advice-adc3efe6a834ae04194ff3637aaadb71880b5c21.tar.bz2 advice-adc3efe6a834ae04194ff3637aaadb71880b5c21.zip | |
Removed yaml-cpp submodule
Project now links against a local installation of yaml-cpp.
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| m--------- | vendor/yaml-cpp | 0 |
3 files changed, 9 insertions, 6 deletions
| diff --git a/.gitmodules b/.gitmodules index 79dde9f..6fecb3f 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -4,6 +4,3 @@ | |||
| 4 | [submodule "vendor/libtwittercpp"] | 4 | [submodule "vendor/libtwittercpp"] |
| 5 | path = vendor/libtwittercpp | 5 | path = vendor/libtwittercpp |
| 6 | url = https://github.com/hatkirby/libtwittercpp | 6 | url = https://github.com/hatkirby/libtwittercpp |
| 7 | [submodule "vendor/yaml-cpp"] | ||
| 8 | path = vendor/yaml-cpp | ||
| 9 | 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) | |||
| 5 | 5 | ||
| 6 | find_package(PkgConfig) | 6 | find_package(PkgConfig) |
| 7 | pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) | 7 | pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) |
| 8 | pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) | ||
| 8 | 9 | ||
| 9 | add_subdirectory(vendor/verbly) | 10 | add_subdirectory(vendor/verbly) |
| 10 | add_subdirectory(vendor/libtwittercpp) | 11 | add_subdirectory(vendor/libtwittercpp) |
| 11 | add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) | ||
| 12 | 12 | ||
| 13 | include_directories(vendor/verbly/lib vendor/libtwittercpp/src vendor/libtwittercpp/vendor/curlcpp/include ${GraphicsMagick_INCLUDE_DIRS} vendor/yaml-cpp/include) | 13 | include_directories( |
| 14 | vendor/verbly/lib | ||
| 15 | vendor/libtwittercpp/src | ||
| 16 | vendor/libtwittercpp/vendor/curlcpp/include | ||
| 17 | ${GraphicsMagick_INCLUDE_DIRS} | ||
| 18 | ${yaml-cpp_INCLUDE_DIRS}) | ||
| 19 | |||
| 14 | add_executable(advice main.cpp advice.cpp sentence.cpp) | 20 | add_executable(advice main.cpp advice.cpp sentence.cpp) |
| 15 | set_property(TARGET advice PROPERTY CXX_STANDARD 11) | 21 | set_property(TARGET advice PROPERTY CXX_STANDARD 11) |
| 16 | set_property(TARGET advice PROPERTY CXX_STANDARD_REQUIRED ON) | 22 | set_property(TARGET advice PROPERTY CXX_STANDARD_REQUIRED ON) |
| 17 | target_link_libraries(advice verbly twitter++ ${GraphicsMagick_LIBRARIES} yaml-cpp) | 23 | 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 | |||
| Subproject bedb28fdb4fd52d97e02f6cb946cae631037089 | |||