summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt13
m---------vendor/yaml-cpp0
3 files changed, 10 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules index b8daec7..176dfe3 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.git 6 url = git@github.com:hatkirby/libtwittercpp.git
7[submodule "vendor/yaml-cpp"]
8 path = vendor/yaml-cpp
9 url = git@github.com:jbeder/yaml-cpp.git
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0462950..c0f8b15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -3,14 +3,21 @@ project (capital)
3 3
4add_subdirectory(vendor/libtwittercpp) 4add_subdirectory(vendor/libtwittercpp)
5add_subdirectory(vendor/verbly) 5add_subdirectory(vendor/verbly)
6add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
7 6
8find_package(PkgConfig) 7find_package(PkgConfig)
9pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED) 8pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED)
9pkg_check_modules(yaml-cpp yaml-cpp REQUIRED)
10
11include_directories(
12 ${GraphicsMagick_INCLUDE_DIRS}
13 vendor/verbly/lib
14 vendor/libtwittercpp/src
15 ${yaml-cpp_INCLUDE_DIRS}
16 vendor/libtwittercpp/vendor/curlcpp/include)
10 17
11include_directories(${GraphicsMagick_INCLUDE_DIRS} vendor/verbly/lib vendor/libtwittercpp/src vendor/yaml-cpp/include vendor/libtwittercpp/vendor/curlcpp/include)
12link_directories(${GraphicsMagick_LIBRARY_DIRS}) 18link_directories(${GraphicsMagick_LIBRARY_DIRS})
19
13add_executable(capital capital.cpp main.cpp) 20add_executable(capital capital.cpp main.cpp)
14set_property(TARGET capital PROPERTY CXX_STANDARD 11) 21set_property(TARGET capital PROPERTY CXX_STANDARD 11)
15set_property(TARGET capital PROPERTY CXX_STANDARD_REQUIRED ON) 22set_property(TARGET capital PROPERTY CXX_STANDARD_REQUIRED ON)
16target_link_libraries(capital ${GraphicsMagick_LIBRARIES} verbly yaml-cpp twitter++) 23target_link_libraries(capital ${GraphicsMagick_LIBRARIES} verbly ${yaml-cpp_LIBRARIES} twitter++)
diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000
Subproject beb44b872c07c74556314e730c6f20a00b32e8e