fix operator type assignment

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79cc7d19755365a5e6a8f684a804418d3042e1bb..2096c43dc9efe189992ddf5047678c5f5a84439e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,10 +18,11 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 project(nominatim)
 
 
 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}")
 
 
 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?\
 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)
 
 endif()
 add_subdirectory(osm2pgsql)
 


@@ -50,13 +51,13 @@ find_package(PostgreSQL REQUIRED)
 include_directories(${PostgreSQL_INCLUDE_DIRS})
 link_directories(${PostgreSQL_LIBRARY_DIRS})
 
 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 "")
+        message(WARNING "pyosmium-get-changes not found (required for updates)")

 else()
 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()
 
 
 endif()
 
 


@@ -96,6 +97,7 @@ set(CUSTOMFILES
     utils/country_languages.php
     utils/imports.php
     utils/importWikipedia.php
     utils/country_languages.php
     utils/imports.php
     utils/importWikipedia.php

+    utils/export.php

     utils/query.php
     utils/server_compare.php
     utils/setup.php
     utils/query.php
     utils/server_compare.php
     utils/setup.php