From 62de4eb955181b7b00364cb14201a91268aa57b4 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Tue, 13 Mar 2018 16:44:43 -0400 Subject: Removed yaml-cpp submodule Project now links against a local installation of yaml-cpp. --- .gitmodules | 3 --- CMakeLists.txt | 16 ++++++++++------ vendor/yaml-cpp | 1 - 3 files changed, 10 insertions(+), 10 deletions(-) delete mode 160000 vendor/yaml-cpp diff --git a/.gitmodules b/.gitmodules index 346e727..2d9ee1e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "vendor/libtwittercpp"] path = vendor/libtwittercpp url = git@github.com:hatkirby/libtwittercpp -[submodule "vendor/yaml-cpp"] - path = vendor/yaml-cpp - 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 @@ cmake_minimum_required (VERSION 3.1) project (grunge) -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) - add_subdirectory(vendor/libtwittercpp) add_subdirectory(vendor/verbly) -add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) find_package(PkgConfig) +pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) -include_directories(${GraphicsMagick_INCLUDE_DIRS} vendor/verbly/lib vendor/libtwittercpp/src vendor/yaml-cpp/include vendor/libtwittercpp/vendor/curlcpp/include) +include_directories( + vendor/libtwittercpp/src + vendor/libtwittercpp/vendor/curlcpp/include + vendor/verbly/lib + ${yaml-cpp_INCLUDE_DIRS} + ${GraphicsMagick_INCLUDE_DIRS}) + link_directories(${GraphicsMagick_LIBRARY_DIRS}) + add_executable(grunge main.cpp grunge.cpp palette.cpp) set_property(TARGET grunge PROPERTY CXX_STANDARD 11) set_property(TARGET grunge PROPERTY CXX_STANDARD_REQUIRED ON) -target_link_libraries(grunge ${GraphicsMagick_LIBRARIES} verbly yaml-cpp twitter++) - +target_link_libraries(grunge ${yaml-cpp_LIBRARIES} ${GraphicsMagick_LIBRARIES} verbly twitter++) diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 index bedb28f..0000000 --- a/vendor/yaml-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bedb28fdb4fd52d97e02f6cb946cae631037089e -- cgit 1.4.1