diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-12-20 16:09:49 -0500 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-12-20 16:09:49 -0500 |
| commit | f0ed0ab7d97a14734762d0b7f512e7a9895b3195 (patch) | |
| tree | 3657a24084510feef827e747f13a11339d211fb6 | |
| parent | 262c4458c5933b70f0dee6fce533630b71c3a184 (diff) | |
| download | wordplay-f0ed0ab7d97a14734762d0b7f512e7a9895b3195.tar.gz wordplay-f0ed0ab7d97a14734762d0b7f512e7a9895b3195.tar.bz2 wordplay-f0ed0ab7d97a14734762d0b7f512e7a9895b3195.zip | |
Removed yaml-cpp submodule
Project now links against a local installation of yaml-cpp.
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| m--------- | vendor/yaml-cpp | 0 |
3 files changed, 8 insertions, 6 deletions
| diff --git a/.gitmodules b/.gitmodules index 3ac2123..9a07567 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -4,6 +4,3 @@ | |||
| 4 | [submodule "vendor/verbly"] | 4 | [submodule "vendor/verbly"] |
| 5 | path = vendor/verbly | 5 | path = vendor/verbly |
| 6 | url = https://github.com/hatkirby/verbly | 6 | url = https://github.com/hatkirby/verbly |
| 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 82fcc44..fe7fd64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -1,13 +1,18 @@ | |||
| 1 | cmake_minimum_required (VERSION 3.1) | 1 | cmake_minimum_required (VERSION 3.1) |
| 2 | project (wordplay) | 2 | project (wordplay) |
| 3 | 3 | ||
| 4 | find_package(PkgConfig) | ||
| 5 | pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) | ||
| 6 | |||
| 4 | add_subdirectory(vendor/libtwittercpp) | 7 | add_subdirectory(vendor/libtwittercpp) |
| 5 | add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) | ||
| 6 | add_subdirectory(vendor/verbly) | 8 | add_subdirectory(vendor/verbly) |
| 7 | 9 | ||
| 8 | include_directories(vendor/verbly/lib vendor/libtwittercpp/src vendor/yaml-cpp/include) | 10 | include_directories( |
| 11 | vendor/verbly/lib | ||
| 12 | vendor/libtwittercpp/src | ||
| 13 | ${yaml-cpp_INCLUDE_DIRS}) | ||
| 9 | 14 | ||
| 10 | add_executable(wordplay wordplay.cpp) | 15 | add_executable(wordplay wordplay.cpp) |
| 11 | set_property(TARGET wordplay PROPERTY CXX_STANDARD 11) | 16 | set_property(TARGET wordplay PROPERTY CXX_STANDARD 11) |
| 12 | set_property(TARGET wordplay PROPERTY CXX_STANDARD_REQUIRED ON) | 17 | set_property(TARGET wordplay PROPERTY CXX_STANDARD_REQUIRED ON) |
| 13 | target_link_libraries(wordplay verbly twitter++ yaml-cpp) | 18 | target_link_libraries(wordplay verbly twitter++ ${yaml-cpp_LIBRARIES}) |
| diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 | |||
| Subproject 57805dfd6a741e55477ea8d4d5b3b6f0272d1f0 | |||