diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-01-25 12:12:50 -0500 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-01-25 12:12:50 -0500 |
| commit | 932872ad17dd0fe86bd8c30f8165e4d0fc0cd5ee (patch) | |
| tree | f2d2a2dac9dbd8821af01040116734d8985ef316 | |
| parent | beb9de04047af3846bb616bfe4706c642de42602 (diff) | |
| download | difference-932872ad17dd0fe86bd8c30f8165e4d0fc0cd5ee.tar.gz difference-932872ad17dd0fe86bd8c30f8165e4d0fc0cd5ee.tar.bz2 difference-932872ad17dd0fe86bd8c30f8165e4d0fc0cd5ee.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 adb9ba1..e444b73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -3,13 +3,19 @@ project (difference) | |||
| 3 | 3 | ||
| 4 | add_subdirectory(vendor/libtwittercpp) | 4 | add_subdirectory(vendor/libtwittercpp) |
| 5 | add_subdirectory(vendor/verbly) | 5 | add_subdirectory(vendor/verbly) |
| 6 | add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) | ||
| 7 | 6 | ||
| 8 | find_package(PkgConfig) | 7 | find_package(PkgConfig) |
| 9 | pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) | 8 | pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) |
| 9 | pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) | ||
| 10 | |||
| 11 | include_directories( | ||
| 12 | vendor/libtwittercpp/src | ||
| 13 | vendor/libtwittercpp/vendor/curlcpp/include | ||
| 14 | vendor/verbly/lib | ||
| 15 | ${GraphicsMagick_INCLUDE_DIRS} | ||
| 16 | ${yaml-cpp_INCLUDE_DIRS}) | ||
| 10 | 17 | ||
| 11 | include_directories(vendor/libtwittercpp/src vendor/libtwittercpp/vendor/curlcpp/include vendor/verbly/lib ${GraphicsMagick_INCLUDE_DIRS} vendor/yaml-cpp/include) | ||
| 12 | add_executable(difference difference.cpp main.cpp) | 18 | add_executable(difference difference.cpp main.cpp) |
| 13 | set_property(TARGET difference PROPERTY CXX_STANDARD 11) | 19 | set_property(TARGET difference PROPERTY CXX_STANDARD 11) |
| 14 | set_property(TARGET difference PROPERTY CXX_STANDARD_REQUIRED ON) | 20 | set_property(TARGET difference PROPERTY CXX_STANDARD_REQUIRED ON) |
| 15 | target_link_libraries(difference verbly yaml-cpp twitter++ ${GraphicsMagick_LIBRARIES}) | 21 | 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 | |||
| Subproject 7d2873ce9f2202ea21b6a8c5ecbc9fe38032c22 | |||