make use of pkg for modeling external dependencies

.gitignore

@@ -18,3 +18,5 @@ compile_commands.json
 [._]s[a-w][a-z]
 *.cppr
 *.hr
+cmake-build-debug
+deps

.gitmodules

@@ -1,9 +1,3 @@
-[submodule "src/cppgtfs"]
-	path = src/cppgtfs
-	url = https://github.com/ad-freiburg/cppgtfs.git
-[submodule "src/xml"]
-	path = src/xml
-	url = https://github.com/patrickbr/pfxml.git
 [submodule "src/configparser"]
 	path = src/configparser
 	url = https://git.patrickbrosi.de/patrick/configparser

.pkg

@@ -0,0 +1,9 @@
+[cppgtfs]
+    url=git@github.com:vesavlad/cppgtfs.git
+    branch=add-propper-cmake-project-definition
+    commit=69dcdbf392b30777dbfc943c6ca512f33df8eac6
+
+[pfxml]
+    url=git@github.com:patrickbr/pfxml.git
+    branch=master
+    commit=c7202d1435b6a4d460fc38b59ca131620b204c4f

CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required (VERSION 2.8)
 
 project (pfaedle)
+include(cmake/pkg.cmake)
 
 if (CMAKE_BUILD_TYPE)
 	string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)

src/CMakeLists.txt

@@ -10,6 +10,5 @@ include_directories(
 
 add_subdirectory(util)
 add_subdirectory(pfaedle)
-add_subdirectory(cppgtfs)
 add_subdirectory(configparser)
 add_subdirectory(shapevl)

src/cppgtfs

@@ -1 +0,0 @@
-Subproject commit 192272f4ab542e75ffad9b545be5cc68e5599828

src/pfaedle/CMakeLists.txt

@@ -17,8 +17,9 @@ configure_file (
 
 add_executable(pfaedle ${pfaedle_main})
 add_library(pfaedle_dep ${pfaedle_SRC})
+target_link_libraries(pfaedle_dep PRIVATE ad_cppgtfs pfxml)
 
 include_directories(pfaedle_dep PUBLIC ${PROJECT_SOURCE_DIR}/src/cppgtfs/src)
-target_link_libraries(pfaedle pfaedle_dep util configparser ad_cppgtfs -lpthread ${LIBZIP_LIBRARY})
+target_link_libraries(pfaedle pfaedle_dep util configparser -lpthread ${LIBZIP_LIBRARY})
 
 add_subdirectory(tests)

src/pfaedle/gtfs/Writer.cpp

@@ -18,7 +18,7 @@
 #include "ad/cppgtfs/Parser.h"
 #include "ad/cppgtfs/Writer.h"
 #include "ad/cppgtfs/gtfs/flat/Agency.h"
-#include "ad/util/CsvWriter.h"
+#include "ad/cppgtfs/util/CsvWriter.h"
 #include "pfaedle/gtfs/Writer.h"
 
 using ad::cppgtfs::Parser;

src/pfaedle/osm/OsmBuilder.cpp

@@ -24,7 +24,7 @@
 #include "util/Misc.h"
 #include "util/Nullable.h"
 #include "util/log/Log.h"
-#include "xml/pfxml.h"
+#include "pfxml/pfxml.h"
 
 using ad::cppgtfs::gtfs::Stop;
 using pfaedle::osm::BlockSearch;

src/pfaedle/osm/OsmBuilder.h

@@ -25,7 +25,7 @@
 #include "util/Nullable.h"
 #include "util/geo/Geo.h"
 #include "util/xml/XmlWriter.h"
-#include "xml/pfxml.h"
+#include "pfxml/pfxml.h"
 
 namespace pfaedle {
 namespace osm {

src/xml

@@ -1 +0,0 @@
-Subproject commit ee9210828b1d1f81fb9ff9f3b7da87327c3390e6