diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-03-26 15:36:13 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-03-26 15:36:13 -0400 |
| commit | 07a11ffc6a1d23815bca45321afa0f3c8661d96d (patch) | |
| tree | a3c5d7aa412eafa15c6a4eb41c9b48353e0d4859 | |
| parent | 0e6355329f241a3e3c8b38cb4146fda4470e6ed0 (diff) | |
| download | cadence-07a11ffc6a1d23815bca45321afa0f3c8661d96d.tar.gz cadence-07a11ffc6a1d23815bca45321afa0f3c8661d96d.tar.bz2 cadence-07a11ffc6a1d23815bca45321afa0f3c8661d96d.zip | |
Removed yaml-cpp submodule
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| m--------- | vendor/yaml-cpp | 0 |
4 files changed, 7 insertions, 7 deletions
| diff --git a/.gitignore b/.gitignore index ff2534f..85f0eb9 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -2,7 +2,6 @@ CMakeCache.txt | |||
| 2 | CMakeFiles | 2 | CMakeFiles |
| 3 | Makefile | 3 | Makefile |
| 4 | cmake_install.cmake | 4 | cmake_install.cmake |
| 5 | yaml-cpp.pc | ||
| 6 | config.yml | 5 | config.yml |
| 7 | data.sqlite3 | 6 | data.sqlite3 |
| 8 | forms.txt | 7 | forms.txt |
| 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 65cfef7..4345e90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -3,12 +3,16 @@ project (cadence) | |||
| 3 | 3 | ||
| 4 | find_package(PkgConfig) | 4 | find_package(PkgConfig) |
| 5 | pkg_check_modules(sqlite3 sqlite3 REQUIRED) | 5 | pkg_check_modules(sqlite3 sqlite3 REQUIRED) |
| 6 | pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) | ||
| 6 | 7 | ||
| 7 | add_subdirectory(vendor/libtwittercpp) | 8 | add_subdirectory(vendor/libtwittercpp) |
| 8 | add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) | ||
| 9 | 9 | ||
| 10 | include_directories(${sqlite3_INCLUDE_DIR} vendor/libtwittercpp/src vendor/yaml-cpp/include) | 10 | include_directories( |
| 11 | ${sqlite3_INCLUDE_DIR} | ||
| 12 | vendor/libtwittercpp/src | ||
| 13 | ${yaml-cpp_INCLUDE_DIRS}) | ||
| 14 | |||
| 11 | add_executable(cadence cadence.cpp) | 15 | add_executable(cadence cadence.cpp) |
| 12 | set_property(TARGET cadence PROPERTY CXX_STANDARD 11) | 16 | set_property(TARGET cadence PROPERTY CXX_STANDARD 11) |
| 13 | set_property(TARGET cadence PROPERTY CXX_STANDARD_REQUIRED ON) | 17 | set_property(TARGET cadence PROPERTY CXX_STANDARD_REQUIRED ON) |
| 14 | target_link_libraries(cadence ${sqlite3_LIBRARIES} twitter++ yaml-cpp) | 18 | target_link_libraries(cadence ${sqlite3_LIBRARIES} twitter++ ${yaml-cpp_LIBRARIES}) |
| diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 | |||
| Subproject 86c69bb73c497bd127afd9802d0aef8ba160f9c | |||