summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt12
m---------vendor/yaml-cpp0
3 files changed, 9 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 5fc053d..837eb8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -5,13 +5,19 @@ set(CMAKE_BUILD_TYPE Debug)
5 5
6find_package(PkgConfig) 6find_package(PkgConfig)
7pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) 7pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED)
8pkg_check_modules(yaml-cpp yaml-cpp REQUIRED)
8 9
9add_subdirectory(vendor/verbly) 10add_subdirectory(vendor/verbly)
10add_subdirectory(vendor/libtwittercpp) 11add_subdirectory(vendor/libtwittercpp)
11add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
12 12
13include_directories(vendor/verbly/lib vendor/libtwittercpp/src vendor/libtwittercpp/vendor/curlcpp/include ${GraphicsMagick_INCLUDE_DIRS} vendor/yaml-cpp/include) 13include_directories(
14 vendor/verbly/lib
15 vendor/libtwittercpp/src
16 vendor/libtwittercpp/vendor/curlcpp/include
17 ${GraphicsMagick_INCLUDE_DIRS}
18 ${yaml-cpp_INCLUDE_DIRS})
19
14add_executable(advice main.cpp advice.cpp sentence.cpp) 20add_executable(advice main.cpp advice.cpp sentence.cpp)
15set_property(TARGET advice PROPERTY CXX_STANDARD 11) 21set_property(TARGET advice PROPERTY CXX_STANDARD 11)
16set_property(TARGET advice PROPERTY CXX_STANDARD_REQUIRED ON) 22set_property(TARGET advice PROPERTY CXX_STANDARD_REQUIRED ON)
17target_link_libraries(advice verbly twitter++ ${GraphicsMagick_LIBRARIES} yaml-cpp) 23target_link_libraries(advice verbly twitter++ ${GraphicsMagick_LIBRARIES} ${yaml-cpp_LIBRARIES})
diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000
Subproject bedb28fdb4fd52d97e02f6cb946cae631037089