X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/45d13bc295dbe83940ae47aaa4ee3b9032a46df4..2171b385519841af0e175d88e51741c5322fba25:/CMakeLists.txt?ds=sidebyside diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fe95f63..8868ea32 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() #----------------------------------------------------------------------------- @@ -271,11 +261,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})