X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/62b7b766624a8297a97cb072cc5334b971be95ea..c55ebf5c95eff81339fdfe2e7912fa163c14f9d7:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index cbbcb9db..d532bf55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,10 +18,11 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") project(nominatim) -set(NOMINATIM_VERSION_MAJOR 2) -set(NOMINATIM_VERSION_MINOR 5) +set(NOMINATIM_VERSION_MAJOR 3) +set(NOMINATIM_VERSION_MINOR 1) +set(NOMINATIM_VERSION_PATCH 0) -set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}") +set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}") add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}") @@ -50,13 +51,13 @@ find_package(PostgreSQL REQUIRED) include_directories(${PostgreSQL_INCLUDE_DIRS}) link_directories(${PostgreSQL_LIBRARY_DIRS}) -find_program(OSMOSIS osmosis) -if (NOT EXISTS "${OSMOSIS}") - set(OSMOSIS_PATH "/nonexistent") - message(WARNING "Osmosis not found (required for updates)") +find_program(PYOSMIUM pyosmium-get-changes) +if (NOT EXISTS "${PYOSMIUM}") + set(PYOSMIUM_PATH "/nonexistent") + message(WARNING "pyosmium-get-changes not found (required for updates)") else() - set(OSMOSIS_PATH "${OSMOSIS}") - message(STATUS "Using osmosis at ${OSMOSIS_PATH}") + set(PYOSMIUM_PATH "${PYOSMIUM}") + message(STATUS "Using pyosmium-get-changes at ${PYOSMIUM_PATH}") endif() @@ -92,6 +93,14 @@ set(CUSTOMFILES website/reverse.php website/search.php website/status.php + website/403.html + website/509.html + website/crossdomain.xml + website/favicon.ico + website/last_update.php + website/nominatim.xml + website/robots.txt + website/taginfo.json utils/blocks.php utils/country_languages.php utils/imports.php