about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt15
m---------vendor/yaml-cpp0
3 files changed, 9 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules index 78fd03a..e1d506f 100644 --- a/.gitmodules +++ b/.gitmodules
@@ -1,6 +1,3 @@
1[submodule "vendor/yaml-cpp"]
2 path = vendor/yaml-cpp
3 url = https://github.com/jbeder/yaml-cpp
4[submodule "vendor/libtwittercpp"] 1[submodule "vendor/libtwittercpp"]
5 path = vendor/libtwittercpp 2 path = vendor/libtwittercpp
6 url = https://github.com/hatkirby/libtwittercpp 3 url = https://github.com/hatkirby/libtwittercpp
diff --git a/CMakeLists.txt b/CMakeLists.txt index ddc6744..1b73fb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -4,13 +4,16 @@ project (rawr-ebooks)
4set(CMAKE_BUILD_TYPE Debug) 4set(CMAKE_BUILD_TYPE Debug)
5 5
6add_subdirectory(vendor/libtwittercpp) 6add_subdirectory(vendor/libtwittercpp)
7include_directories(vendor/libtwittercpp/src)
8
9add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
10include_directories(vendor/yaml-cpp/include)
11 7
12find_package(ASPELL REQUIRED) 8find_package(ASPELL REQUIRED)
13include_directories(${ASPELL_INCLUDE_DIR}) 9
10find_package(PkgConfig)
11pkg_check_modules(yaml-cpp yaml-cpp REQUIRED)
12
13include_directories(
14 vendor/libtwittercpp/src
15 ${ASPELL_INCLUDE_DIR}
16 ${yaml-cpp_INCLUDE_DIRS})
14 17
15add_library(rawr kgramstats.cpp histogram.cpp prefix_search.cpp) 18add_library(rawr kgramstats.cpp histogram.cpp prefix_search.cpp)
16set_property(TARGET rawr PROPERTY CXX_STANDARD 11) 19set_property(TARGET rawr PROPERTY CXX_STANDARD 11)
@@ -20,7 +23,7 @@ target_link_libraries(rawr ${ASPELL_LIBRARIES})
20add_executable(rawr-ebooks ebooks.cpp) 23add_executable(rawr-ebooks ebooks.cpp)
21set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD 11) 24set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD 11)
22set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD_REQUIRED ON) 25set_property(TARGET rawr-ebooks PROPERTY CXX_STANDARD_REQUIRED ON)
23target_link_libraries(rawr-ebooks rawr yaml-cpp twitter++) 26target_link_libraries(rawr-ebooks rawr ${yaml-cpp_LIBRARIES} twitter++)
24 27
25add_executable(rawr-gen gen.cpp) 28add_executable(rawr-gen gen.cpp)
26set_property(TARGET rawr-gen PROPERTY CXX_STANDARD 11) 29set_property(TARGET rawr-gen PROPERTY CXX_STANDARD 11)
diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000
Subproject 57805dfd6a741e55477ea8d4d5b3b6f0272d1f0