X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/99dcd10d3fb1b79ee69ed73def9038a0f5118ebe..af739d2f57854ba223c8c1f13c03954f56c49a5b:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 691c9adc..1aa9c315 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,8 +18,8 @@ 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 0) set(NOMINATIM_VERSION_PATCH 0) set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}") @@ -36,7 +36,9 @@ 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") #----------------------------------------------------------------------------- # osm2pgsql (imports/updates only) @@ -61,7 +63,7 @@ endif() #----------------------------------------------------------------------------- if (BUILD_IMPORTER) - find_package(PythonInterp 3.5 REQUIRED) + find_package(PythonInterp 3.6 REQUIRED) endif() #----------------------------------------------------------------------------- @@ -108,22 +110,6 @@ if (BUILD_IMPORTER) " wget -O ${PROJECT_SOURCE_DIR}/data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz") endif() - 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() - configure_file(${PROJECT_SOURCE_DIR}/cmake/tool.tmpl ${PROJECT_BINARY_DIR}/nominatim) endif() @@ -168,7 +154,7 @@ if (BUILD_TESTS) if (PHPCS) message(STATUS "Using phpcs binary ${PHPCS}") add_test(NAME phpcs - COMMAND ${PHPCS} --report-width=120 --colors lib website utils + COMMAND ${PHPCS} --report-width=120 --colors lib-php WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) else() message(WARNING "phpcs not found. PHP linting tests disabled." ) @@ -177,7 +163,7 @@ if (BUILD_TESTS) 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.") @@ -209,6 +195,14 @@ if (BUILD_DOCS) add_subdirectory(docs) endif() +#----------------------------------------------------------------------------- +# Manual page +#----------------------------------------------------------------------------- + +if (BUILD_MANPAGE) + add_subdirectory(man) +endif() + #----------------------------------------------------------------------------- # Installation #----------------------------------------------------------------------------- @@ -218,6 +212,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) @@ -231,14 +226,20 @@ if (BUILD_IMPORTER) PATTERN __pycache__ EXCLUDE) install(DIRECTORY lib-sql DESTINATION ${NOMINATIM_LIBDIR}) - install(FILES data/country_name.sql - ${COUNTRY_GRID_FILE} + install(FILES ${COUNTRY_GRID_FILE} data/words.sql DESTINATION ${NOMINATIM_DATADIR}) endif() if (BUILD_OSM2PGSQL) - install(TARGETS osm2pgsql RUNTIME 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() if (BUILD_MODULE) @@ -252,10 +253,22 @@ endif() install(FILES settings/env.defaults settings/address-levels.json - settings/phrase_settings.php + 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/icu_tokenizer.yaml + settings/country_settings.yaml + DESTINATION ${NOMINATIM_CONFIGDIR}) + +install(DIRECTORY settings/icu-rules DESTINATION ${NOMINATIM_CONFIGDIR}) + +if (INSTALL_MUNIN_PLUGINS) + install(FILES munin/nominatim_importlag + munin/nominatim_query_speed + munin/nominatim_requests + DESTINATION ${NOMINATIM_MUNINDIR}) +endif()