about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt10
m---------vendor/yaml-cpp0
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
2CMakeFiles 2CMakeFiles
3Makefile 3Makefile
4cmake_install.cmake 4cmake_install.cmake
5yaml-cpp.pc
6config.yml 5config.yml
7data.sqlite3 6data.sqlite3
8forms.txt 7forms.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
4find_package(PkgConfig) 4find_package(PkgConfig)
5pkg_check_modules(sqlite3 sqlite3 REQUIRED) 5pkg_check_modules(sqlite3 sqlite3 REQUIRED)
6pkg_check_modules(yaml-cpp yaml-cpp REQUIRED)
6 7
7add_subdirectory(vendor/libtwittercpp) 8add_subdirectory(vendor/libtwittercpp)
8add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
9 9
10include_directories(${sqlite3_INCLUDE_DIR} vendor/libtwittercpp/src vendor/yaml-cpp/include) 10include_directories(
11 ${sqlite3_INCLUDE_DIR}
12 vendor/libtwittercpp/src
13 ${yaml-cpp_INCLUDE_DIRS})
14
11add_executable(cadence cadence.cpp) 15add_executable(cadence cadence.cpp)
12set_property(TARGET cadence PROPERTY CXX_STANDARD 11) 16set_property(TARGET cadence PROPERTY CXX_STANDARD 11)
13set_property(TARGET cadence PROPERTY CXX_STANDARD_REQUIRED ON) 17set_property(TARGET cadence PROPERTY CXX_STANDARD_REQUIRED ON)
14target_link_libraries(cadence ${sqlite3_LIBRARIES} twitter++ yaml-cpp) 18target_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