From 2baac060c0d78cc4bcca0a8925ed29903a9f90bf Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Tue, 13 Mar 2018 17:02:18 -0400 Subject: Removed yaml-cpp submodule Project now links against a local installation of yaml-cpp. --- .gitmodules | 3 --- CMakeLists.txt | 13 ++++++++----- vendor/yaml-cpp | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) delete mode 160000 vendor/yaml-cpp diff --git a/.gitmodules b/.gitmodules index 79dde9f..6fecb3f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "vendor/libtwittercpp"] path = vendor/libtwittercpp url = https://github.com/hatkirby/libtwittercpp -[submodule "vendor/yaml-cpp"] - path = vendor/yaml-cpp - url = https://github.com/jbeder/yaml-cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c72ef4..cc3fccd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,18 +1,21 @@ cmake_minimum_required (VERSION 3.1) project (infinite) -set(CMAKE_BUILD_TYPE Debug) - add_subdirectory(vendor/libtwittercpp) add_subdirectory(vendor/verbly) -add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) find_package(PkgConfig) pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) +pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) + +include_directories( + ${GraphicsMagick_INCLUDE_DIRS} + vendor/verbly/lib + vendor/libtwittercpp/src + ${yaml-cpp_INCLUDE_DIRS}) -include_directories(${GraphicsMagick_INCLUDE_DIRS} vendor/verbly/lib vendor/libtwittercpp/src vendor/yaml-cpp/include) link_directories(${GraphicsMagick_LIBRARY_DIRS}) add_executable(infinite infinite.cpp color.cpp fractal.cpp matrix3x3.cpp vector3d.cpp tinyxml2.cpp triangle.cpp) set_property(TARGET infinite PROPERTY CXX_STANDARD 11) set_property(TARGET infinite PROPERTY CXX_STANDARD_REQUIRED ON) -target_link_libraries(infinite ${GraphicsMagick_LIBRARIES} verbly yaml-cpp twitter++) +target_link_libraries(infinite ${GraphicsMagick_LIBRARIES} verbly ${yaml-cpp_LIBRARIES} twitter++) diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000 index 7d2873c..0000000 --- a/vendor/yaml-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7d2873ce9f2202ea21b6a8c5ecbc9fe38032c229 -- cgit 1.4.1