about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt14
m---------vendor/yaml-cpp0
3 files changed, 10 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules index 16192d6..08a42de 100644 --- a/.gitmodules +++ b/.gitmodules
@@ -4,3 +4,6 @@
4[submodule "vendor/twitcurl"] 4[submodule "vendor/twitcurl"]
5 path = vendor/twitcurl 5 path = vendor/twitcurl
6 url = https://github.com/swatkat/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
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9508ca5..97d19b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -1,17 +1,17 @@
1cmake_minimum_required (VERSION 2.6) 1cmake_minimum_required (VERSION 3.1)
2project (chemist) 2project (chemist)
3 3
4set(CMAKE_BUILD_TYPE Debug) 4set(CMAKE_BUILD_TYPE Debug)
5 5
6add_subdirectory(vendor/twitcurl/libtwitcurl)
7add_subdirectory(vendor/verbly)
8
9find_package(PkgConfig) 6find_package(PkgConfig)
10pkg_check_modules(YamlCpp yaml-cpp REQUIRED)
11pkg_check_modules(sqlite3 sqlite3 REQUIRED) 7pkg_check_modules(sqlite3 sqlite3 REQUIRED)
12 8
13include_directories(vendor/twitcurl/libtwitcurl ${sqlite3_INCLUDE_DIR} vendor/verbly/lib) 9add_subdirectory(vendor/twitcurl/libtwitcurl)
10add_subdirectory(vendor/verbly)
11add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
12
13include_directories(vendor/twitcurl/libtwitcurl ${sqlite3_INCLUDE_DIR} vendor/verbly/lib vendor/yaml-cpp/include)
14add_executable(chemist chemist.cpp) 14add_executable(chemist chemist.cpp)
15set_property(TARGET chemist PROPERTY CXX_STANDARD 11) 15set_property(TARGET chemist PROPERTY CXX_STANDARD 11)
16set_property(TARGET chemist PROPERTY CXX_STANDARD_REQUIRED ON) 16set_property(TARGET chemist PROPERTY CXX_STANDARD_REQUIRED ON)
17target_link_libraries(chemist verbly ${sqlite3_LIBRARIES} ${YamlCpp_LIBRARIES} twitcurl curl) 17target_link_libraries(chemist verbly ${sqlite3_LIBRARIES} yaml-cpp twitcurl curl)
diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp new file mode 160000
Subproject 34bd1a7083e5875e6a4b2d4f61c0b356cc5d53f