Skip to content

Commit

Permalink
update util, correctly include libzip to fix issues on mac
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickbr committed Nov 22, 2023
1 parent 814363d commit edf7b44
Show file tree
Hide file tree
Showing 15 changed files with 21 additions and 16 deletions.
9 changes: 7 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
set(TRANSITMAP_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_BINARY_DIR})
set(LOOM_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_BINARY_DIR})

include_directories(${TRANSITMAP_INCLUDE_DIR})
include_directories(${LOOM_INCLUDE_DIR})

if (LIBZIP_FOUND)
include_directories( SYSTEM ${LIBZIP_INCLUDE_DIR} )
include_directories( SYSTEM ${LIBZIP_CONF_INCLUDE_DIR} )
endif( LIBZIP_FOUND )

add_subdirectory(shared)
add_subdirectory(util)
Expand Down
2 changes: 1 addition & 1 deletion src/dot/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ list(REMOVE_ITEM dot_SRC ${dot2tg_main})
list(REMOVE_ITEM dot_SRC TestMain.cpp)

include_directories(
${TRANSITMAP_INCLUDE_DIR}
${LOOM_INCLUDE_DIR}
)

add_subdirectory(tests)
Expand Down
2 changes: 1 addition & 1 deletion src/dot/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include_directories(
${TRANSITMAP_INCLUDE_DIR}
${LOOM_INCLUDE_DIR}
)

add_executable(dotTest TestMain.cpp)
Expand Down
2 changes: 1 addition & 1 deletion src/gtfs2graph/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include_directories(
${TRANSITMAP_INCLUDE_DIR}
${LOOM_INCLUDE_DIR}
)

add_executable(gtfs2graphTest TestMain.cpp)
Expand Down
2 changes: 1 addition & 1 deletion src/loom/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ list(REMOVE_ITEM loom_SRC ${loom_main})
list(REMOVE_ITEM loom_SRC TestMain.cpp)

include_directories(
${TRANSITMAP_INCLUDE_DIR}
${LOOM_INCLUDE_DIR}
SYSTEM ${GUROBI_INCLUDE_DIR}
SYSTEM ${GLPK_INCLUDE_DIR}
SYSTEM ${COIN_INCLUDE_DIR}
Expand Down
2 changes: 1 addition & 1 deletion src/loom/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include_directories(
${TRANSITMAP_INCLUDE_DIR}
${LOOM_INCLUDE_DIR}
)

add_executable(loomTest TestMain.cpp)
Expand Down
2 changes: 1 addition & 1 deletion src/octi/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include_directories(
${TRANSITMAP_INCLUDE_DIR}
${LOOM_INCLUDE_DIR}
)

add_executable(octiTest TestMain.cpp)
Expand Down
2 changes: 1 addition & 1 deletion src/shared/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
file(GLOB_RECURSE shared_SRC *.cpp)

include_directories(
${TRANSITMAP_INCLUDE_DIR}
${LOOM_INCLUDE_DIR}
SYSTEM ${GUROBI_INCLUDE_DIR}
SYSTEM ${GLPK_INCLUDE_DIR}
SYSTEM ${COIN_INCLUDE_DIR}
Expand Down
2 changes: 1 addition & 1 deletion src/shared/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include_directories(
${TRANSITMAP_INCLUDE_DIR}
${LOOM_INCLUDE_DIR}
)

add_executable(sharedTest TestMain.cpp)
Expand Down
2 changes: 1 addition & 1 deletion src/topo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ list(REMOVE_ITEM topo_SRC ${topo_main})
list(REMOVE_ITEM topo_SRC TestMain.cpp)

include_directories(
${TRANSITMAP_INCLUDE_DIR}
${LOOM_INCLUDE_DIR}
)

add_subdirectory(tests)
Expand Down
2 changes: 1 addition & 1 deletion src/topo/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ file(GLOB_RECURSE test_SRC *.cpp)
list(REMOVE_ITEM test_SRC TestMain.cpp)

include_directories(
${TRANSITMAP_INCLUDE_DIR}
${LOOM_INCLUDE_DIR}
)

add_executable(topoTest TestMain.cpp)
Expand Down
2 changes: 1 addition & 1 deletion src/topoeval/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set(topoeval_main TopoEvalMain.cpp)
list(REMOVE_ITEM topoeval_SRC ${topoeval_main})

include_directories(
${TRANSITMAP_INCLUDE_DIR}
${LOOM_INCLUDE_DIR}
)

configure_file (
Expand Down
2 changes: 1 addition & 1 deletion src/transitmap/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ list(REMOVE_ITEM transitmap_SRC ${transitmap_main})
list(REMOVE_ITEM transitmap_SRC TestMain.cpp)

include_directories(
${TRANSITMAP_INCLUDE_DIR}
${LOOM_INCLUDE_DIR}
)

add_subdirectory(output/protobuf)
Expand Down
2 changes: 1 addition & 1 deletion src/transitmap/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include_directories(
${TRANSITMAP_INCLUDE_DIR}
${LOOM_INCLUDE_DIR}
)

add_executable(transitmapTest TestMain.cpp)
Expand Down
2 changes: 1 addition & 1 deletion src/util
Submodule util updated 1 files
+0 −4 tests/CMakeLists.txt

0 comments on commit edf7b44

Please sign in to comment.