Merge remote-tracking branch 'upstream/master'

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d532bf55d7bec51e59790ed52c08f4d9dd0229e6..8f9de5ec711b1a0c2d5cbf1058858d49415e9801 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)
 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}")
 set(NOMINATIM_VERSION_PATCH 0)
 
 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,14 +77,23 @@ 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
 #
 #-----------------------------------------------------------------------------
 

-set(CUSTOMFILES
-    settings/phrase_settings.php
+set(WEBSITESCRIPTS

     website/deletable.php
     website/details.php
     website/hierarchy.php
     website/deletable.php
     website/details.php
     website/hierarchy.php


@@ -93,31 +102,47 @@ set(CUSTOMFILES
     website/reverse.php
     website/search.php
     website/status.php
     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
+)
+
+set(WEBSITEFILES
+    403.html
+    509.html
+    crossdomain.xml
+    favicon.ico
+    last_update.php
+    nominatim.xml
+    robots.txt
+    taginfo.json
+)
+
+set(CUSTOMSCRIPTS

     utils/country_languages.php
     utils/country_languages.php

-    utils/imports.php

     utils/importWikipedia.php
     utils/importWikipedia.php

+    utils/export.php

     utils/query.php
     utils/query.php

-    utils/server_compare.php

     utils/setup.php
     utils/specialphrases.php
     utils/update.php
     utils/warm.php
    )
 
     utils/setup.php
     utils/specialphrases.php
     utils/update.php
     utils/warm.php
    )
 

-foreach (cfile ${CUSTOMFILES})
-    configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
+foreach (script_source ${CUSTOMSCRIPTS})
+    configure_file(${PROJECT_SOURCE_DIR}/cmake/script.tmpl
+                   ${PROJECT_BINARY_DIR}/${script_source})
+endforeach()
+
+foreach (script_source ${WEBSITESCRIPTS})
+    configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl
+                   ${PROJECT_BINARY_DIR}/${script_source})
+endforeach()
+
+foreach (webfile ${WEBSITEFILES})
+    configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
+                   ${PROJECT_BINARY_DIR}/website/${webfile})

 endforeach()
 
 endforeach()
 

-configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php ${PROJECT_BINARY_DIR}/settings/settings.php)
+configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
+               ${PROJECT_BINARY_DIR}/settings/settings.php)

 
 set(WEBPATHS css images js)
 
 
 set(WEBPATHS css images js)