diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-12-19 12:45:48 -0500 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-12-19 12:45:48 -0500 |
| commit | bd018c38b3c2715be8f95ac2d07ca070ded7cc6d (patch) | |
| tree | 55e7473b927006a3a723fdced4b5a1d696797fb4 | |
| parent | 55ebfbba1f24e1b3e2e7efa7defa14897eab1c64 (diff) | |
| download | capital-bd018c38b3c2715be8f95ac2d07ca070ded7cc6d.tar.gz capital-bd018c38b3c2715be8f95ac2d07ca070ded7cc6d.tar.bz2 capital-bd018c38b3c2715be8f95ac2d07ca070ded7cc6d.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 | 13 | ||||
| m--------- | vendor/yaml-cpp | 0 |
3 files changed, 10 insertions, 6 deletions
| diff --git a/.gitmodules b/.gitmodules index b8daec7..176dfe3 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 = git@github.com:hatkirby/libtwittercpp.git | 6 | url = git@github.com:hatkirby/libtwittercpp.git |
| 7 | [submodule "vendor/yaml-cpp"] | ||
| 8 | path = vendor/yaml-cpp | ||
| 9 | 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) | |||
| 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 | ${GraphicsMagick_INCLUDE_DIRS} | ||
| 13 | vendor/verbly/lib | ||
| 14 | vendor/libtwittercpp/src | ||
| 15 | ${yaml-cpp_INCLUDE_DIRS} | ||
| 16 | vendor/libtwittercpp/vendor/curlcpp/include) | ||
| 10 | 17 | ||
| 11 | include_directories(${GraphicsMagick_INCLUDE_DIRS} vendor/verbly/lib vendor/libtwittercpp/src vendor/yaml-cpp/include vendor/libtwittercpp/vendor/curlcpp/include) | ||
| 12 | link_directories(${GraphicsMagick_LIBRARY_DIRS}) | 18 | link_directories(${GraphicsMagick_LIBRARY_DIRS}) |
| 19 | |||
| 13 | add_executable(capital capital.cpp main.cpp) | 20 | add_executable(capital capital.cpp main.cpp) |
| 14 | set_property(TARGET capital PROPERTY CXX_STANDARD 11) | 21 | set_property(TARGET capital PROPERTY CXX_STANDARD 11) |
| 15 | set_property(TARGET capital PROPERTY CXX_STANDARD_REQUIRED ON) | 22 | set_property(TARGET capital PROPERTY CXX_STANDARD_REQUIRED ON) |
| 16 | target_link_libraries(capital ${GraphicsMagick_LIBRARIES} verbly yaml-cpp twitter++) | 23 | 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 | |||
| Subproject beb44b872c07c74556314e730c6f20a00b32e8e | |||