diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-01-10 11:01:43 -0500 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-01-10 11:01:43 -0500 |
| commit | abd320d920292daa7d44d95173bcf5eeac0ce9a2 (patch) | |
| tree | c210f450ce077a87cc4f9b02513282698f083060 | |
| parent | 6035e62b8935130a1ad213163510f881f6ded0e4 (diff) | |
| download | owo-abd320d920292daa7d44d95173bcf5eeac0ce9a2.tar.gz owo-abd320d920292daa7d44d95173bcf5eeac0ce9a2.tar.bz2 owo-abd320d920292daa7d44d95173bcf5eeac0ce9a2.zip | |
Removed yaml-cpp submodule
| -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 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 805e684..d5520bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -1,12 +1,19 @@ | |||
| 1 | cmake_minimum_required (VERSION 3.1) | 1 | cmake_minimum_required (VERSION 3.1) |
| 2 | project (owo) | 2 | project (owo) |
| 3 | 3 | ||
| 4 | find_package(PkgConfig) | ||
| 5 | pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) | ||
| 6 | |||
| 4 | add_subdirectory(vendor/verbly) | 7 | add_subdirectory(vendor/verbly) |
| 5 | add_subdirectory(vendor/libtwittercpp) | 8 | add_subdirectory(vendor/libtwittercpp) |
| 6 | add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) | ||
| 7 | 9 | ||
| 8 | include_directories(vendor/verbly/lib vendor/libtwittercpp/src vendor/yaml-cpp/include) | 10 | include_directories( |
| 11 | vendor/verbly/lib | ||
| 12 | vendor/libtwittercpp/src | ||
| 13 | ${yaml-cpp_INCLUDE_DIRS}) | ||
| 14 | |||
| 9 | add_executable(owo owo.cpp) | 15 | add_executable(owo owo.cpp) |
| 10 | set_property(TARGET owo PROPERTY CXX_STANDARD 11) | 16 | set_property(TARGET owo PROPERTY CXX_STANDARD 11) |
| 11 | set_property(TARGET owo PROPERTY CXX_STANDARD_REQUIRED ON) | 17 | set_property(TARGET owo PROPERTY CXX_STANDARD_REQUIRED ON) |
| 12 | target_link_libraries(owo verbly twitter++ yaml-cpp) | 18 | |
| 19 | target_link_libraries(owo verbly twitter++ ${yaml-cpp_LIBRARIES}) | ||
| diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 | |||
| Subproject b5b03bb9ad6325f844314e397fb3f1b1c58eeef | |||