X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2ae13c55837ab13396ad87119c00536f4c078d73..122ecd46269d48a8b2aacba2474311c0400d2a9d:/CMakeLists.txt?ds=sidebyside diff --git a/CMakeLists.txt b/CMakeLists.txt index 52bb9a01..e31362fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") project(nominatim) set(NOMINATIM_VERSION_MAJOR 4) -set(NOMINATIM_VERSION_MINOR 0) +set(NOMINATIM_VERSION_MINOR 5) set(NOMINATIM_VERSION_PATCH 0) set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}") @@ -44,10 +44,7 @@ endif() set(BUILD_IMPORTER on CACHE BOOL "Build everything for importing/updating the database") set(BUILD_API on CACHE BOOL "Build everything for the API server") -set(BUILD_MODULE on CACHE BOOL "Build PostgreSQL module") set(BUILD_TESTS on CACHE BOOL "Build test suite") -set(BUILD_DOCS on CACHE BOOL "Build documentation") -set(BUILD_MANPAGE on CACHE BOOL "Build Manual Page") set(BUILD_OSM2PGSQL on CACHE BOOL "Build osm2pgsql (expert only)") set(INSTALL_MUNIN_PLUGINS on CACHE BOOL "Install Munin plugins for supervising Nominatim") @@ -63,7 +60,6 @@ if (BUILD_IMPORTER AND BUILD_OSM2PGSQL) endif() set(BUILD_TESTS_SAVED "${BUILD_TESTS}") set(BUILD_TESTS off) - set(WITH_LUA off CACHE BOOL "") add_subdirectory(osm2pgsql) set(BUILD_TESTS ${BUILD_TESTS_SAVED}) endif() @@ -73,36 +69,8 @@ endif() # python (imports/updates only) #----------------------------------------------------------------------------- -if (BUILD_IMPORTER) - find_package(PythonInterp 3.6 REQUIRED) -endif() - -#----------------------------------------------------------------------------- -# PHP -#----------------------------------------------------------------------------- - -# Setting PHP binary variable as to command line (prevailing) or auto detect - -if (BUILD_API OR BUILD_IMPORTER) - if (NOT PHP_BIN) - find_program (PHP_BIN php) - endif() - # sanity check if PHP binary exists - if (NOT EXISTS ${PHP_BIN}) - message(FATAL_ERROR "PHP binary not found. Install php or provide location with -DPHP_BIN=/path/php ") - 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() +if (BUILD_IMPORTER OR BUILD_API) + find_package(PythonInterp 3.7 REQUIRED) endif() #----------------------------------------------------------------------------- @@ -137,8 +105,6 @@ if (BUILD_TESTS) find_program(PYTHON_BEHAVE behave) find_program(PYLINT NAMES pylint3 pylint) find_program(PYTEST NAMES pytest py.test-3 py.test) - find_program(PHPCS phpcs) - find_program(PHPUNIT phpunit) if (PYTHON_BEHAVE) message(STATUS "Using Python behave binary ${PYTHON_BEHAVE}") @@ -153,24 +119,6 @@ if (BUILD_TESTS) message(WARNING "behave not found. BDD tests disabled." ) endif() - if (PHPUNIT) - message(STATUS "Using phpunit binary ${PHPUNIT}") - add_test(NAME php - COMMAND ${PHPUNIT} ./ - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/test/php) - else() - message(WARNING "phpunit not found. PHP unit tests disabled." ) - endif() - - if (PHPCS) - message(STATUS "Using phpcs binary ${PHPCS}") - add_test(NAME phpcs - COMMAND ${PHPCS} --report-width=120 --colors lib-php - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) - else() - message(WARNING "phpcs not found. PHP linting tests disabled." ) - endif() - if (PYLINT) message(STATUS "Using pylint binary ${PYLINT}") add_test(NAME pylint @@ -190,30 +138,6 @@ if (BUILD_TESTS) endif() endif() -#----------------------------------------------------------------------------- -# Postgres module -#----------------------------------------------------------------------------- - -if (BUILD_MODULE) - add_subdirectory(module) -endif() - -#----------------------------------------------------------------------------- -# Documentation -#----------------------------------------------------------------------------- - -if (BUILD_DOCS) - add_subdirectory(docs) -endif() - -#----------------------------------------------------------------------------- -# Manual page -#----------------------------------------------------------------------------- - -if (BUILD_MANPAGE) - add_subdirectory(man) -endif() - #----------------------------------------------------------------------------- # Installation #----------------------------------------------------------------------------- @@ -231,10 +155,19 @@ if (BUILD_IMPORTER) DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME nominatim) - install(DIRECTORY nominatim - DESTINATION ${NOMINATIM_LIBDIR}/lib-python - FILES_MATCHING PATTERN "*.py" - PATTERN __pycache__ EXCLUDE) + configure_file(${PROJECT_SOURCE_DIR}/cmake/paths-py-no-php.tmpl paths-py.installed) + + foreach (submodule nominatim_db nominatim_api) + install(DIRECTORY src/${submodule} + DESTINATION ${NOMINATIM_LIBDIR}/lib-python + FILES_MATCHING PATTERN "*.py" + PATTERN "paths.py" EXCLUDE + PATTERN __pycache__ EXCLUDE) + install(FILES ${PROJECT_BINARY_DIR}/paths-py.installed + DESTINATION ${NOMINATIM_LIBDIR}/lib-python/${submodule} + RENAME paths.py) + endforeach() + install(DIRECTORY lib-sql DESTINATION ${NOMINATIM_LIBDIR}) install(FILES ${COUNTRY_GRID_FILE} @@ -253,29 +186,23 @@ if (BUILD_OSM2PGSQL) endif() endif() -if (BUILD_MODULE) - install(PROGRAMS ${PROJECT_BINARY_DIR}/module/nominatim.so - DESTINATION ${NOMINATIM_LIBDIR}/module) -endif() - -if (BUILD_API) - install(DIRECTORY lib-php DESTINATION ${NOMINATIM_LIBDIR}) -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}) install(DIRECTORY settings/icu-rules DESTINATION ${NOMINATIM_CONFIGDIR}) +install(DIRECTORY settings/country-names + DESTINATION ${NOMINATIM_CONFIGDIR}) if (INSTALL_MUNIN_PLUGINS) install(FILES munin/nominatim_importlag @@ -283,3 +210,7 @@ if (INSTALL_MUNIN_PLUGINS) munin/nominatim_requests DESTINATION ${NOMINATIM_MUNINDIR}) endif() + +message(WARNING "Building with CMake is deprecated and will be removed in Nominatim 5.0." + "Use Nominatim pip packages instead.\n" + "See https://nominatim.org/release-docs/develop/admin/Installation/#downloading-and-building-nominatim")