diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-03-13 16:44:43 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-03-13 16:44:43 -0400 |
| commit | 62de4eb955181b7b00364cb14201a91268aa57b4 (patch) | |
| tree | 4f15e6ac6ce1bb7097d5c98d5c337d5fdb597800 | |
| parent | 31a8d2f8541384cfecfecfa5b872edb424b1ec14 (diff) | |
| download | grunge-62de4eb955181b7b00364cb14201a91268aa57b4.tar.gz grunge-62de4eb955181b7b00364cb14201a91268aa57b4.tar.bz2 grunge-62de4eb955181b7b00364cb14201a91268aa57b4.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 | 16 | ||||
| m--------- | vendor/yaml-cpp | 0 |
3 files changed, 10 insertions, 9 deletions
| diff --git a/.gitmodules b/.gitmodules index 346e727..2d9ee1e 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -4,6 +4,3 @@ | |||
| 4 | [submodule "vendor/libtwittercpp"] | 4 | [submodule "vendor/libtwittercpp"] |
| 5 | path = vendor/libtwittercpp | 5 | path = vendor/libtwittercpp |
| 6 | url = git@github.com:hatkirby/libtwittercpp | 6 | url = git@github.com:hatkirby/libtwittercpp |
| 7 | [submodule "vendor/yaml-cpp"] | ||
| 8 | path = vendor/yaml-cpp | ||
| 9 | url = git@github.com:jbeder/yaml-cpp | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt index d9b21f5..0eaaa10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -1,19 +1,23 @@ | |||
| 1 | cmake_minimum_required (VERSION 3.1) | 1 | cmake_minimum_required (VERSION 3.1) |
| 2 | project (grunge) | 2 | project (grunge) |
| 3 | 3 | ||
| 4 | set(CMAKE_EXPORT_COMPILE_COMMANDS ON) | ||
| 5 | |||
| 6 | add_subdirectory(vendor/libtwittercpp) | 4 | add_subdirectory(vendor/libtwittercpp) |
| 7 | add_subdirectory(vendor/verbly) | 5 | add_subdirectory(vendor/verbly) |
| 8 | add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) | ||
| 9 | 6 | ||
| 10 | find_package(PkgConfig) | 7 | find_package(PkgConfig) |
| 8 | pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) | ||
| 11 | pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) | 9 | pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) |
| 12 | 10 | ||
| 13 | include_directories(${GraphicsMagick_INCLUDE_DIRS} vendor/verbly/lib vendor/libtwittercpp/src vendor/yaml-cpp/include vendor/libtwittercpp/vendor/curlcpp/include) | 11 | include_directories( |
| 12 | vendor/libtwittercpp/src | ||
| 13 | vendor/libtwittercpp/vendor/curlcpp/include | ||
| 14 | vendor/verbly/lib | ||
| 15 | ${yaml-cpp_INCLUDE_DIRS} | ||
| 16 | ${GraphicsMagick_INCLUDE_DIRS}) | ||
| 17 | |||
| 14 | link_directories(${GraphicsMagick_LIBRARY_DIRS}) | 18 | link_directories(${GraphicsMagick_LIBRARY_DIRS}) |
| 19 | |||
| 15 | add_executable(grunge main.cpp grunge.cpp palette.cpp) | 20 | add_executable(grunge main.cpp grunge.cpp palette.cpp) |
| 16 | set_property(TARGET grunge PROPERTY CXX_STANDARD 11) | 21 | set_property(TARGET grunge PROPERTY CXX_STANDARD 11) |
| 17 | set_property(TARGET grunge PROPERTY CXX_STANDARD_REQUIRED ON) | 22 | set_property(TARGET grunge PROPERTY CXX_STANDARD_REQUIRED ON) |
| 18 | target_link_libraries(grunge ${GraphicsMagick_LIBRARIES} verbly yaml-cpp twitter++) | 23 | target_link_libraries(grunge ${yaml-cpp_LIBRARIES} ${GraphicsMagick_LIBRARIES} verbly twitter++) |
| 19 | |||
| diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 | |||
| Subproject bedb28fdb4fd52d97e02f6cb946cae631037089 | |||