diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-08-04 19:25:22 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-08-04 19:25:22 -0400 |
| commit | cb7166d7bccc4b16292c9e1359b9bc091afad716 (patch) | |
| tree | fc6b51e8e7e567b074db86fa51aa4a7f6a585779 | |
| parent | 2a40a70aa8f9c464f9d91314c6c7265e1b6a1049 (diff) | |
| download | blessed-cb7166d7bccc4b16292c9e1359b9bc091afad716.tar.gz blessed-cb7166d7bccc4b16292c9e1359b9bc091afad716.tar.bz2 blessed-cb7166d7bccc4b16292c9e1359b9bc091afad716.zip | |
Removed yaml-cpp submodule
| -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 79aa7f0..6fecb3f 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -1,9 +1,6 @@ | |||
| 1 | [submodule "vendor/verbly"] | 1 | [submodule "vendor/verbly"] |
| 2 | path = vendor/verbly | 2 | path = vendor/verbly |
| 3 | url = https://github.com/hatkirby/verbly | 3 | url = https://github.com/hatkirby/verbly |
| 4 | [submodule "vendor/yaml-cpp"] | ||
| 5 | path = vendor/yaml-cpp | ||
| 6 | url = https://github.com/jbeder/yaml-cpp | ||
| 7 | [submodule "vendor/libtwittercpp"] | 4 | [submodule "vendor/libtwittercpp"] |
| 8 | path = vendor/libtwittercpp | 5 | path = vendor/libtwittercpp |
| 9 | url = https://github.com/hatkirby/libtwittercpp | 6 | url = https://github.com/hatkirby/libtwittercpp |
| diff --git a/CMakeLists.txt b/CMakeLists.txt index 793ae7e..0a0a209 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -3,10 +3,16 @@ project (blessed) | |||
| 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 | include_directories(vendor/libtwittercpp/src vendor/verbly/lib vendor/yaml-cpp/include) | 7 | find_package(PkgConfig) |
| 8 | pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) | ||
| 9 | |||
| 10 | include_directories( | ||
| 11 | vendor/libtwittercpp/src | ||
| 12 | vendor/verbly/lib | ||
| 13 | ${yaml-cpp_INCLUDE_DIRS}) | ||
| 14 | |||
| 9 | add_executable(blessed blessed.cpp) | 15 | add_executable(blessed blessed.cpp) |
| 10 | set_property(TARGET blessed PROPERTY CXX_STANDARD 11) | 16 | set_property(TARGET blessed PROPERTY CXX_STANDARD 11) |
| 11 | set_property(TARGET blessed PROPERTY CXX_STANDARD_REQUIRED ON) | 17 | set_property(TARGET blessed PROPERTY CXX_STANDARD_REQUIRED ON) |
| 12 | target_link_libraries(blessed twitter++ yaml-cpp verbly) | 18 | target_link_libraries(blessed twitter++ ${yaml-cpp_LIBRARIES} verbly) |
| diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 | |||
| Subproject 34bd1a7083e5875e6a4b2d4f61c0b356cc5d53f | |||