Commit 1cfc6291 authored by Volker Krause's avatar Volker Krause
Browse files

Fix build of the generator tools after moving the library code

parent 4630733b
...@@ -12,13 +12,13 @@ add_executable(generate-knowledgedb ...@@ -12,13 +12,13 @@ add_executable(generate-knowledgedb
timezonedbgenerator.cpp timezonedbgenerator.cpp
trainstationdbgenerator.cpp trainstationdbgenerator.cpp
util.cpp util.cpp
../stringutil.cpp ../lib/stringutil.cpp
../knowledgedb/stationidentifier.cpp ../lib/knowledgedb/stationidentifier.cpp
) )
target_compile_definitions(generate-knowledgedb PRIVATE "KITINERARY_STATIC_DEFINE") target_compile_definitions(generate-knowledgedb PRIVATE "KITINERARY_STATIC_DEFINE")
target_include_directories(generate-knowledgedb PRIVATE target_include_directories(generate-knowledgedb PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../knowledgedb ${CMAKE_CURRENT_SOURCE_DIR}/../lib/knowledgedb
${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/../lib
) )
target_link_libraries(generate-knowledgedb PRIVATE Qt5::Network Qt5::Gui KOSM) target_link_libraries(generate-knowledgedb PRIVATE Qt5::Network Qt5::Gui KOSM)
# extract all elements we are interested in (airports, terminals, stations at airports) # extract all elements we are interested in (airports, terminals, stations at airports)
...@@ -38,7 +38,7 @@ function(generate_db dbtype outfile) ...@@ -38,7 +38,7 @@ function(generate_db dbtype outfile)
endif() endif()
add_custom_command( add_custom_command(
OUTPUT ${outfile} OUTPUT ${outfile}
COMMAND generate-knowledgedb -o ${CMAKE_CURRENT_SOURCE_DIR}/../knowledgedb/${outfile} -d ${dbtype} ${extra_args} COMMAND generate-knowledgedb -o ${CMAKE_CURRENT_SOURCE_DIR}/../lib/knowledgedb/${outfile} -d ${dbtype} ${extra_args}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS DEPENDS
${ARGN} ${ARGN}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment