diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-03-13 17:02:18 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-03-13 17:03:18 -0400 |
| commit | 2baac060c0d78cc4bcca0a8925ed29903a9f90bf (patch) | |
| tree | 53e29bdc1ac5ed269e24522653bac70c1da9ec46 | |
| parent | 3bc878e63d709bbe41307c154c7ca4aee9486237 (diff) | |
| download | infinite-2baac060c0d78cc4bcca0a8925ed29903a9f90bf.tar.gz infinite-2baac060c0d78cc4bcca0a8925ed29903a9f90bf.tar.bz2 infinite-2baac060c0d78cc4bcca0a8925ed29903a9f90bf.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 | 13 | ||||
| m--------- | vendor/yaml-cpp | 0 |
3 files changed, 8 insertions, 8 deletions
| diff --git a/.gitmodules b/.gitmodules index 79dde9f..6fecb3f 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 = https://github.com/hatkirby/libtwittercpp | 6 | url = https://github.com/hatkirby/libtwittercpp |
| 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 1c72ef4..cc3fccd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -1,18 +1,21 @@ | |||
| 1 | cmake_minimum_required (VERSION 3.1) | 1 | cmake_minimum_required (VERSION 3.1) |
| 2 | project (infinite) | 2 | project (infinite) |
| 3 | 3 | ||
| 4 | set(CMAKE_BUILD_TYPE Debug) | ||
| 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) |
| 11 | pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) | 8 | pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) |
| 9 | pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) | ||
| 10 | |||
| 11 | include_directories( | ||
| 12 | ${GraphicsMagick_INCLUDE_DIRS} | ||
| 13 | vendor/verbly/lib | ||
| 14 | vendor/libtwittercpp/src | ||
| 15 | ${yaml-cpp_INCLUDE_DIRS}) | ||
| 12 | 16 | ||
| 13 | include_directories(${GraphicsMagick_INCLUDE_DIRS} vendor/verbly/lib vendor/libtwittercpp/src vendor/yaml-cpp/include) | ||
| 14 | link_directories(${GraphicsMagick_LIBRARY_DIRS}) | 17 | link_directories(${GraphicsMagick_LIBRARY_DIRS}) |
| 15 | add_executable(infinite infinite.cpp color.cpp fractal.cpp matrix3x3.cpp vector3d.cpp tinyxml2.cpp triangle.cpp) | 18 | add_executable(infinite infinite.cpp color.cpp fractal.cpp matrix3x3.cpp vector3d.cpp tinyxml2.cpp triangle.cpp) |
| 16 | set_property(TARGET infinite PROPERTY CXX_STANDARD 11) | 19 | set_property(TARGET infinite PROPERTY CXX_STANDARD 11) |
| 17 | set_property(TARGET infinite PROPERTY CXX_STANDARD_REQUIRED ON) | 20 | set_property(TARGET infinite PROPERTY CXX_STANDARD_REQUIRED ON) |
| 18 | target_link_libraries(infinite ${GraphicsMagick_LIBRARIES} verbly yaml-cpp twitter++) | 21 | 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 | |||
| Subproject 7d2873ce9f2202ea21b6a8c5ecbc9fe38032c22 | |||