diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-03-25 17:48:13 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-03-25 17:48:13 -0400 |
| commit | cf2323aa9ead54b05b8d0e04cef2bb7a5d0beba0 (patch) | |
| tree | 0283007cb2f47ecf33349f17a6867d5e958c8da7 | |
| parent | 2d8c8b0d8827159edcabd3a8665f45ef65cb3153 (diff) | |
| download | toldya-cf2323aa9ead54b05b8d0e04cef2bb7a5d0beba0.tar.gz toldya-cf2323aa9ead54b05b8d0e04cef2bb7a5d0beba0.tar.bz2 toldya-cf2323aa9ead54b05b8d0e04cef2bb7a5d0beba0.zip | |
Removed yaml-cpp submodule
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| m--------- | vendor/yaml-cpp | 0 |
3 files changed, 8 insertions, 6 deletions
| diff --git a/.gitmodules b/.gitmodules index 8544219..e1d506f 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | [submodule "vendor/libtwittercpp"] | 1 | [submodule "vendor/libtwittercpp"] |
| 2 | path = vendor/libtwittercpp | 2 | path = vendor/libtwittercpp |
| 3 | url = https://github.com/hatkirby/libtwittercpp | 3 | url = https://github.com/hatkirby/libtwittercpp |
| 4 | [submodule "vendor/yaml-cpp"] | ||
| 5 | path = vendor/yaml-cpp | ||
| 6 | url = https://github.com/jbeder/yaml-cpp | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt index df9ccfe..bd250a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -2,10 +2,15 @@ cmake_minimum_required (VERSION 3.1) | |||
| 2 | project (toldya) | 2 | project (toldya) |
| 3 | 3 | ||
| 4 | add_subdirectory(vendor/libtwittercpp) | 4 | add_subdirectory(vendor/libtwittercpp) |
| 5 | add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) | ||
| 6 | 5 | ||
| 7 | include_directories(vendor/libtwittercpp/src vendor/yaml-cpp/include) | 6 | find_package(PkgConfig) |
| 7 | pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) | ||
| 8 | |||
| 9 | include_directories( | ||
| 10 | vendor/libtwittercpp/src | ||
| 11 | ${yaml-cpp_INCLUDE_DIRS}) | ||
| 12 | |||
| 8 | add_executable(toldya toldya.cpp) | 13 | add_executable(toldya toldya.cpp) |
| 9 | set_property(TARGET toldya PROPERTY CXX_STANDARD 11) | 14 | set_property(TARGET toldya PROPERTY CXX_STANDARD 11) |
| 10 | set_property(TARGET toldya PROPERTY CXX_STANDARD_REQUIRED ON) | 15 | set_property(TARGET toldya PROPERTY CXX_STANDARD_REQUIRED ON) |
| 11 | target_link_libraries(toldya yaml-cpp twitter++) | 16 | target_link_libraries(toldya ${yaml-cpp_LIBRARIES} twitter++) |
| diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 | |||
| Subproject 728e26e42645d4d70ca65522990f915f47b47a5 | |||