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