about 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 3ac2123..9a07567 100644 --- a/.gitmodules +++ b/.gitmodules
@@ -4,6 +4,3 @@
4[submodule "vendor/verbly"] 4[submodule "vendor/verbly"]
5 path = vendor/verbly 5 path = vendor/verbly
6 url = https://github.com/hatkirby/verbly 6 url = https://github.com/hatkirby/verbly
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 82fcc44..fe7fd64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -1,13 +1,18 @@
1cmake_minimum_required (VERSION 3.1) 1cmake_minimum_required (VERSION 3.1)
2project (wordplay) 2project (wordplay)
3 3
4find_package(PkgConfig)
5pkg_check_modules(yaml-cpp yaml-cpp REQUIRED)
6
4add_subdirectory(vendor/libtwittercpp) 7add_subdirectory(vendor/libtwittercpp)
5add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
6add_subdirectory(vendor/verbly) 8add_subdirectory(vendor/verbly)
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})
9 14
10add_executable(wordplay wordplay.cpp) 15add_executable(wordplay wordplay.cpp)
11set_property(TARGET wordplay PROPERTY CXX_STANDARD 11) 16set_property(TARGET wordplay PROPERTY CXX_STANDARD 11)
12set_property(TARGET wordplay PROPERTY CXX_STANDARD_REQUIRED ON) 17set_property(TARGET wordplay PROPERTY CXX_STANDARD_REQUIRED ON)
13target_link_libraries(wordplay verbly twitter++ yaml-cpp) 18target_link_libraries(wordplay verbly twitter++ ${yaml-cpp_LIBRARIES})
diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000
Subproject 57805dfd6a741e55477ea8d4d5b3b6f0272d1f0