diff options
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | CMakeLists.txt | 7 | ||||
m--------- | vendor/yaml-cpp | 0 |
3 files changed, 7 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 037e2c6..581c545 100644 --- a/.gitmodules +++ b/.gitmodules | |||
@@ -1,3 +1,6 @@ | |||
1 | [submodule "vendor/twitcurl"] | 1 | [submodule "vendor/twitcurl"] |
2 | path = vendor/twitcurl | 2 | path = vendor/twitcurl |
3 | url = https://github.com/swatkat/twitcurl | 3 | url = https://github.com/swatkat/twitcurl |
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 307a777..2150374 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -7,12 +7,13 @@ add_subdirectory(vendor/twitcurl/libtwitcurl) | |||
7 | 7 | ||
8 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") | 8 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") |
9 | 9 | ||
10 | find_package(PkgConfig) | ||
11 | pkg_check_modules(YamlCpp yaml-cpp REQUIRED) | ||
12 | find_package(Mysql REQUIRED) | 10 | find_package(Mysql REQUIRED) |
13 | 11 | ||
12 | add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) | ||
13 | include_directories(vendor/yaml-cpp/include) | ||
14 | |||
14 | include_directories(vendor/twitcurl/libtwitcurl ${MYSQL_INCLUDE_DIR}) | 15 | include_directories(vendor/twitcurl/libtwitcurl ${MYSQL_INCLUDE_DIR}) |
15 | add_executable(nancy nancy.cpp) | 16 | add_executable(nancy nancy.cpp) |
16 | set_property(TARGET nancy PROPERTY CXX_STANDARD 11) | 17 | set_property(TARGET nancy PROPERTY CXX_STANDARD 11) |
17 | set_property(TARGET nancy PROPERTY CXX_STANDARD_REQUIRED ON) | 18 | set_property(TARGET nancy PROPERTY CXX_STANDARD_REQUIRED ON) |
18 | target_link_libraries(nancy ${YamlCpp_LIBRARIES} ${MYSQL_LIBRARIES} twitcurl curl) | 19 | target_link_libraries(nancy yaml-cpp ${MYSQL_LIBRARIES} twitcurl curl) |
diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp new file mode 160000 | |||
Subproject 57805dfd6a741e55477ea8d4d5b3b6f0272d1f0 | |||