X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/20f56dfc77453b60e3e2a5dff2e400024affe96b..878a1d756d34169609ab64ee228d164bbf3bfad7:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fe95f63..cf76f00c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ endif() #----------------------------------------------------------------------------- if (BUILD_IMPORTER) - find_package(PythonInterp 3.6 REQUIRED) + find_package(PythonInterp 3.7 REQUIRED) endif() #----------------------------------------------------------------------------- @@ -92,16 +92,6 @@ if (BUILD_API OR BUILD_IMPORTER) else() message (STATUS "Using PHP binary " ${PHP_BIN}) endif() - if (NOT PHPCGI_BIN) - find_program (PHPCGI_BIN php-cgi) - endif() - # sanity check if PHP binary exists - if (NOT EXISTS ${PHPCGI_BIN}) - message(WARNING "php-cgi binary not found. nominatim tool will not provide query functions.") - set (PHPCGI_BIN "") - else() - message (STATUS "Using php-cgi binary " ${PHPCGI_BIN}) - endif() endif() #----------------------------------------------------------------------------- @@ -124,6 +114,27 @@ if (BUILD_IMPORTER) ${PROJECT_BINARY_DIR}/nominatim) endif() +#----------------------------------------------------------------------------- +# Targets for running a development webserver from the build directory. +#----------------------------------------------------------------------------- + +if (BUILD_API) + set(WEBSITEFILES + 403.html + 509.html + crossdomain.xml + favicon.ico + nominatim.xml + robots.txt + taginfo.json + ) + + foreach (webfile ${WEBSITEFILES}) + configure_file(${PROJECT_SOURCE_DIR}/website/${webfile} + ${PROJECT_BINARY_DIR}/website/${webfile}) + endforeach() +endif() + #----------------------------------------------------------------------------- # Tests #----------------------------------------------------------------------------- @@ -271,11 +282,12 @@ endif() install(FILES settings/env.defaults settings/address-levels.json settings/phrase-settings.json - settings/import-admin.style - settings/import-street.style - settings/import-address.style - settings/import-full.style - settings/import-extratags.style + settings/import-admin.lua + settings/import-street.lua + settings/import-address.lua + settings/import-full.lua + settings/import-extratags.lua + settings/flex-base.lua settings/icu_tokenizer.yaml settings/country_settings.yaml DESTINATION ${NOMINATIM_CONFIGDIR})