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, 9 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules index ec4d45e..886cf0c 100644 --- a/.gitmodules +++ b/.gitmodules
@@ -1,9 +1,6 @@
1[submodule "vendor/libtwittercpp"] 1[submodule "vendor/libtwittercpp"]
2 path = vendor/libtwittercpp 2 path = vendor/libtwittercpp
3 url = git@github.com:hatkirby/libtwittercpp 3 url = git@github.com:hatkirby/libtwittercpp
4[submodule "vendor/yaml-cpp"]
5 path = vendor/yaml-cpp
6 url = git@github.com:jbeder/yaml-cpp
7[submodule "vendor/verbly"] 4[submodule "vendor/verbly"]
8 path = vendor/verbly 5 path = vendor/verbly
9 url = git@github.com:hatkirby/verbly 6 url = git@github.com:hatkirby/verbly
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8266a02..0ce3bea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -1,13 +1,18 @@
1cmake_minimum_required (VERSION 3.1) 1cmake_minimum_required (VERSION 3.1)
2project (father) 2project (father)
3 3
4find_package(PkgConfig)
5pkg_check_modules(yaml-cpp yaml-cpp REQUIRED)
6
4add_subdirectory(vendor/libtwittercpp) 7add_subdirectory(vendor/libtwittercpp)
5add_subdirectory(vendor/verbly) 8add_subdirectory(vendor/verbly)
6add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL)
7 9
8include_directories(vendor/libtwittercpp/src vendor/yaml-cpp/include vendor/verbly/lib) 10include_directories(
11 vendor/libtwittercpp/src
12 vendor/verbly/lib
13 ${yaml-cpp_INCLUDE_DIRS})
14
9add_executable(father father.cpp) 15add_executable(father father.cpp)
10set_property(TARGET father PROPERTY CXX_STANDARD 11) 16set_property(TARGET father PROPERTY CXX_STANDARD 11)
11set_property(TARGET father PROPERTY CXX_STANDARD_REQUIRED ON) 17set_property(TARGET father PROPERTY CXX_STANDARD_REQUIRED ON)
12target_link_libraries(father verbly yaml-cpp twitter++) 18target_link_libraries(father verbly twitter++ ${yaml-cpp_LIBRARIES})
13
diff --git a/vendor/yaml-cpp b/vendor/yaml-cpp deleted file mode 160000
Subproject bedb28fdb4fd52d97e02f6cb946cae631037089