summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules6
-rw-r--r--CMakeLists.txt12
m---------vendor/yaml-cpp0
3 files changed, 9 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules index 2d58700..6fecb3f 100644 --- a/.gitmodules +++ b/.gitmodules
@@ -1,12 +1,6 @@
1[submodule "vendor/verbly"] 1[submodule "vendor/verbly"]
2 path = vendor/verbly 2 path = vendor/verbly
3 url = https://github.com/hatkirby/verbly 3 url = https://github.com/hatkirby/verbly
4[submodule "vendor/twitcurl"]
5 path = vendor/twitcurl
6 url = https://github.com/swatkat/twitcurl
7[submodule "vendor/yaml-cpp"]
8 path = vendor/yaml-cpp
9 url = https://github.com/jbeder/yaml-cpp
10[submodule "vendor/libtwittercpp"] 4[submodule "vendor/libtwittercpp"]
11 path = vendor/libtwittercpp 5 path = vendor/libtwittercpp
12 url = https://github.com/hatkirby/libtwittercpp 6 url = https://github.com/hatkirby/libtwittercpp
diff --git a/CMakeLists.txt b/CMakeLists.txt index b9a143f..1a7a4c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -2,11 +2,17 @@ cmake_minimum_required (VERSION 3.1)
2project (insult) 2project (insult)
3 3
4add_subdirectory(vendor/verbly) 4add_subdirectory(vendor/verbly)
5add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
6add_subdirectory(vendor/libtwittercpp) 5add_subdirectory(vendor/libtwittercpp)
7 6
8include_directories(vendor/verbly/lib vendor/yaml-cpp/include vendor/libtwittercpp/src) 7find_package(PkgConfig)
8pkg_check_modules(yaml-cpp yaml-cpp REQUIRED)
9
10include_directories(
11 vendor/verbly/lib
12 ${yaml-cpp_INCLUDE_DIRS}
13 vendor/libtwittercpp/src)
14
9add_executable(insult insult.cpp patterner.cpp) 15add_executable(insult insult.cpp patterner.cpp)
10set_property(TARGET insult PROPERTY CXX_STANDARD 11) 16set_property(TARGET insult PROPERTY CXX_STANDARD 11)
11set_property(TARGET insult PROPERTY CXX_STANDARD_REQUIRED ON) 17set_property(TARGET insult PROPERTY CXX_STANDARD_REQUIRED ON)
12target_link_libraries(insult verbly twitter++ yaml-cpp) 18target_link_libraries(insult verbly twitter++ ${yaml-cpp_LIBRARIES})
diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000
Subproject 34bd1a7083e5875e6a4b2d4f61c0b356cc5d53f