From 496ee739bc58135945067192178ce802b6ec9e5c Mon Sep 17 00:00:00 2001 From: Patrick Brosi Date: Wed, 12 Oct 2022 12:48:22 +0200 Subject: [PATCH] update cppgtfs, also link shapevl against libzip --- src/cppgtfs | 2 +- src/shapevl/CMakeLists.txt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cppgtfs b/src/cppgtfs index 21f511f..f21cc40 160000 --- a/src/cppgtfs +++ b/src/cppgtfs @@ -1 +1 @@ -Subproject commit 21f511f4cff44bff275b2e6e456b7b30ed07d6f1 +Subproject commit f21cc4088937e324d146f23fbc2e101e26103201 diff --git a/src/shapevl/CMakeLists.txt b/src/shapevl/CMakeLists.txt index e6bdc17..bb55963 100644 --- a/src/shapevl/CMakeLists.txt +++ b/src/shapevl/CMakeLists.txt @@ -6,10 +6,12 @@ list(REMOVE_ITEM shapevl_SRC ${shapevl_main}) include_directories( ${PFAEDLE_INCLUDE_DIR} + SYSTEM ${LIBZIP_INCLUDE_DIR} + SYSTEM ${LIBZIP_CONF_INCLUDE_DIR} ) add_executable(shapevl ${shapevl_main}) add_library(shapevl_dep ${shapevl_SRC}) include_directories(shapevl_dep PUBLIC ${PROJECT_SOURCE_DIR}/src/cppgtfs/src) -target_link_libraries(shapevl shapevl_dep util ad_cppgtfs -lpthread) +target_link_libraries(shapevl shapevl_dep util ad_cppgtfs -lpthread ${LIBZIP_LIBRARY})