diff options
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | CMakeLists.txt | 13 | ||||
m--------- | vendor/yaml-cpp | 0 |
3 files changed, 8 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules index 8544219..e1d506f 100644 --- a/.gitmodules +++ b/.gitmodules | |||
@@ -1,6 +1,3 @@ | |||
1 | [submodule "vendor/libtwittercpp"] | 1 | [submodule "vendor/libtwittercpp"] |
2 | path = vendor/libtwittercpp | 2 | path = vendor/libtwittercpp |
3 | url = https://github.com/hatkirby/libtwittercpp | 3 | url = https://github.com/hatkirby/libtwittercpp |
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 348f7cc..323fb56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -1,13 +1,16 @@ | |||
1 | cmake_minimum_required (VERSION 3.1) | 1 | cmake_minimum_required (VERSION 3.1) |
2 | project (manifesto) | 2 | project (manifesto) |
3 | 3 | ||
4 | set(CMAKE_BUILD_TYPE Debug) | ||
5 | |||
6 | add_subdirectory(vendor/libtwittercpp) | 4 | add_subdirectory(vendor/libtwittercpp) |
7 | add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) | ||
8 | 5 | ||
9 | include_directories(vendor/libtwittercpp/src vendor/yaml-cpp/include) | 6 | find_package(PkgConfig) |
7 | pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) | ||
8 | |||
9 | include_directories( | ||
10 | vendor/libtwittercpp/src | ||
11 | ${yaml-cpp_INCLUDE_DIRS}) | ||
12 | |||
10 | add_executable(manifesto manifesto.cpp) | 13 | add_executable(manifesto manifesto.cpp) |
11 | set_property(TARGET manifesto PROPERTY CXX_STANDARD 11) | 14 | set_property(TARGET manifesto PROPERTY CXX_STANDARD 11) |
12 | set_property(TARGET manifesto PROPERTY CXX_STANDARD_REQUIRED ON) | 15 | set_property(TARGET manifesto PROPERTY CXX_STANDARD_REQUIRED ON) |
13 | target_link_libraries(manifesto yaml-cpp twitter++) | 16 | target_link_libraries(manifesto ${yaml-cpp_LIBRARIES} twitter++) |
diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 | |||
Subproject 85af926ddc5f3c8fb438001743e65ec3a039cee | |||