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. --- CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'CMakeLists.txt') 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++) -- cgit 1.4.1