Merge remote-tracking branch 'upstream/master'

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 267784c3e3d542d362456931363e660b0dd3e58f..7c5763fd47b678f03f7ac7f998c04c6b394c8023 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,8 +19,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 project(nominatim)
 
 set(NOMINATIM_VERSION_MAJOR 3)
 project(nominatim)
 
 set(NOMINATIM_VERSION_MAJOR 3)

-set(NOMINATIM_VERSION_MINOR 0)
-set(NOMINATIM_VERSION_PATCH 1)
+set(NOMINATIM_VERSION_MINOR 2)
+set(NOMINATIM_VERSION_PATCH 0)

 
 set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")
 
 
 set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")
 


@@ -53,7 +53,7 @@ link_directories(${PostgreSQL_LIBRARY_DIRS})
 
 find_program(PYOSMIUM pyosmium-get-changes)
 if (NOT EXISTS "${PYOSMIUM}")
 
 find_program(PYOSMIUM pyosmium-get-changes)
 if (NOT EXISTS "${PYOSMIUM}")

-    set(PYOSMIUM_PATH "/nonexistent")
+    set(PYOSMIUM_PATH "")

         message(WARNING "pyosmium-get-changes not found (required for updates)")
 else()
     set(PYOSMIUM_PATH "${PYOSMIUM}")
         message(WARNING "pyosmium-get-changes not found (required for updates)")
 else()
     set(PYOSMIUM_PATH "${PYOSMIUM}")


@@ -77,6 +77,16 @@ find_package(BZip2 REQUIRED)
 find_package(LibXml2 REQUIRED)
 include_directories(${LIBXML2_INCLUDE_DIR})
 
 find_package(LibXml2 REQUIRED)
 include_directories(${LIBXML2_INCLUDE_DIR})
 

+# Setting PHP binary variable as to command line (prevailing) or auto detect
+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 ")
+endif()
+message (STATUS "Using PHP binary " ${PHP_BIN})
+

 #-----------------------------------------------------------------------------
 #
 # Setup settings and paths
 #-----------------------------------------------------------------------------
 #
 # Setup settings and paths


@@ -103,8 +113,8 @@ set(CUSTOMFILES
     website/taginfo.json
     utils/blocks.php
     utils/country_languages.php
     website/taginfo.json
     utils/blocks.php
     utils/country_languages.php

-    utils/imports.php

     utils/importWikipedia.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