X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/5682d1688d1646e99af3ca9af9f7f89c18ea143a..2cf21a3008ce527cfd22a7c2ab3bf7a13bb23e38:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 79cc7d19..7ecf2b2c 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 0) +set(NOMINATIM_VERSION_PATCH 1) -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}") @@ -38,7 +39,7 @@ set(WITH_LUA off CACHE BOOL "Build with lua support" FORCE) if (NOT EXISTS "${CMAKE_SOURCE_DIR}/osm2pgsql/CMakeLists.txt") message(FATAL_ERROR "The osm2pgsql directory is empty.\ Did you forget to check out Nominatim recursively?\ - \nTry updating submodules with: git submodules update --init") + \nTry updating submodules with: git submodule update --init") endif() add_subdirectory(osm2pgsql) @@ -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()