Merge remote-tracking branch 'upstream/master'

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e35b6d01af71b2d784d6ef60cceb04f55752d96e..7c5763fd47b678f03f7ac7f998c04c6b394c8023 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 project(nominatim)
 
 set(NOMINATIM_VERSION_MAJOR 3)
-set(NOMINATIM_VERSION_MINOR 1)
+set(NOMINATIM_VERSION_MINOR 2)
 set(NOMINATIM_VERSION_PATCH 0)
 
 set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")
@@ -83,9 +83,9 @@ if (NOT PHP_BIN)
 endif()
 # sanity check if PHP binary exists
 if (NOT EXISTS ${PHP_BIN})
-    message(FATAL_ERROR "PHP binary not found install php or provide location by -DPHP_BIN=/path/php ")
+    message(FATAL_ERROR "PHP binary not found. Install php or provide location with -DPHP_BIN=/path/php ")
 endif()
-message (STATUS "Setting PHP_BIN= " ${PHP_BIN})
+message (STATUS "Using PHP binary " ${PHP_BIN})
 
 #-----------------------------------------------------------------------------
 #
@@ -103,15 +103,21 @@ 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
     utils/importWikipedia.php
     utils/export.php
     utils/query.php
     utils/server_compare.php
     utils/setup.php
-    utils/setup_functions.php
     utils/specialphrases.php
     utils/update.php
     utils/warm.php