X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/745ae02f477e6f262041e9dd5d83f3b880aa79c6..23369ce9704d3815faae22697338916a60ddf682:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 02bc490f..e31362fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ # #----------------------------------------------------------------------------- -cmake_minimum_required(VERSION 2.8 FATAL_ERROR) +cmake_minimum_required(VERSION 3.0 FATAL_ERROR) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") @@ -18,14 +18,25 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") project(nominatim) -set(NOMINATIM_VERSION_MAJOR 3) -set(NOMINATIM_VERSION_MINOR 6) +set(NOMINATIM_VERSION_MAJOR 4) +set(NOMINATIM_VERSION_MINOR 5) set(NOMINATIM_VERSION_PATCH 0) set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}") add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}") +# Setting GIT_HASH +find_package(Git) +if (GIT_FOUND) + execute_process( + COMMAND "${GIT_EXECUTABLE}" log -1 --format=%h + WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} + OUTPUT_VARIABLE GIT_HASH + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET + ) +endif() #----------------------------------------------------------------------------- # Configuration @@ -33,10 +44,9 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}") 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_OSM2PGSQL on CACHE BOOL "Build osm2pgsql (expert only)") +set(INSTALL_MUNIN_PLUGINS on CACHE BOOL "Install Munin plugins for supervising Nominatim") #----------------------------------------------------------------------------- # osm2pgsql (imports/updates only) @@ -50,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() @@ -60,36 +69,8 @@ endif() # python (imports/updates only) #----------------------------------------------------------------------------- -if (BUILD_IMPORTER) - find_package(PythonInterp 3.5 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() #----------------------------------------------------------------------------- @@ -97,21 +78,16 @@ endif() #----------------------------------------------------------------------------- if (BUILD_IMPORTER) - set(CUSTOMSCRIPTS - check_import_finished.php - country_languages.php - export.php - query.php - setup.php - specialphrases.php - update.php - warm.php - ) - - foreach (script_source ${CUSTOMSCRIPTS}) - configure_file(${PROJECT_SOURCE_DIR}/cmake/script.tmpl - ${PROJECT_BINARY_DIR}/utils/${script_source}) - endforeach() + find_file(COUNTRY_GRID_FILE country_osm_grid.sql.gz + PATHS ${PROJECT_SOURCE_DIR}/data + NO_DEFAULT_PATH + DOC "Location of the country grid file." + ) + + if (NOT COUNTRY_GRID_FILE) + message(FATAL_ERROR "\nYou need to download the country_osm_grid first:\n" + " wget -O ${PROJECT_SOURCE_DIR}/data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz") + endif() configure_file(${PROJECT_SOURCE_DIR}/cmake/tool.tmpl ${PROJECT_BINARY_DIR}/nominatim) @@ -129,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}") @@ -145,28 +119,10 @@ 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 website utils - 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 - COMMAND ${PYLINT} --extension-pkg-whitelist=osmium nominatim + COMMAND ${PYLINT} nominatim WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) else() message(WARNING "pylint not found. Python linting tests disabled.") @@ -182,22 +138,6 @@ if (BUILD_TESTS) endif() endif() -#----------------------------------------------------------------------------- -# Postgres module -#----------------------------------------------------------------------------- - -if (BUILD_MODULE) - add_subdirectory(module) -endif() - -#----------------------------------------------------------------------------- -# Documentation -#----------------------------------------------------------------------------- - -if (BUILD_DOCS) - add_subdirectory(docs) -endif() - #----------------------------------------------------------------------------- # Installation #----------------------------------------------------------------------------- @@ -207,6 +147,7 @@ include(GNUInstallDirs) set(NOMINATIM_DATADIR ${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}) set(NOMINATIM_LIBDIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}) set(NOMINATIM_CONFIGDIR ${CMAKE_INSTALL_FULL_SYSCONFDIR}/${PROJECT_NAME}) +set(NOMINATIM_MUNINDIR ${CMAKE_INSTALL_FULL_DATADIR}/munin/plugins) if (BUILD_IMPORTER) configure_file(${PROJECT_SOURCE_DIR}/cmake/tool-installed.tmpl installed.bin) @@ -214,37 +155,62 @@ 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 data/country_name.sql - data/country_osm_grid.sql.gz + install(FILES ${COUNTRY_GRID_FILE} data/words.sql DESTINATION ${NOMINATIM_DATADIR}) endif() if (BUILD_OSM2PGSQL) - install(TARGETS osm2pgsql RUNTIME DESTINATION ${NOMINATIM_LIBDIR}) -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}) + if (${CMAKE_VERSION} VERSION_LESS 3.13) + # Installation of subdirectory targets was only introduced in 3.13. + # So just copy the osm2pgsql file for older versions. + install(PROGRAMS ${PROJECT_BINARY_DIR}/osm2pgsql/osm2pgsql + DESTINATION ${NOMINATIM_LIBDIR}) + else() + install(TARGETS osm2pgsql RUNTIME DESTINATION ${NOMINATIM_LIBDIR}) + endif() endif() install(FILES settings/env.defaults settings/address-levels.json - settings/phrase_settings.php - settings/import-admin.style - settings/import-street.style - settings/import-address.style - settings/import-full.style - settings/import-extratags.style + settings/phrase-settings.json + 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 + munin/nominatim_query_speed + 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")