summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt11
m---------vendor/yaml-cpp0
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)
2project (toldya) 2project (toldya)
3 3
4add_subdirectory(vendor/libtwittercpp) 4add_subdirectory(vendor/libtwittercpp)
5add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
6 5
7include_directories(vendor/libtwittercpp/src vendor/yaml-cpp/include) 6find_package(PkgConfig)
7pkg_check_modules(yaml-cpp yaml-cpp REQUIRED)
8
9include_directories(
10 vendor/libtwittercpp/src
11 ${yaml-cpp_INCLUDE_DIRS})
12
8add_executable(toldya toldya.cpp) 13add_executable(toldya toldya.cpp)
9set_property(TARGET toldya PROPERTY CXX_STANDARD 11) 14set_property(TARGET toldya PROPERTY CXX_STANDARD 11)
10set_property(TARGET toldya PROPERTY CXX_STANDARD_REQUIRED ON) 15set_property(TARGET toldya PROPERTY CXX_STANDARD_REQUIRED ON)
11target_link_libraries(toldya yaml-cpp twitter++) 16target_link_libraries(toldya ${yaml-cpp_LIBRARIES} twitter++)
diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000
Subproject 728e26e42645d4d70ca65522990f915f47b47a5