Revert "code beauty improvements"

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e55a8a543e864ee6d8a4a1796913fb88383f88d..e35b6d01af71b2d784d6ef60cceb04f55752d96e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,7 @@ link_directories(${PostgreSQL_LIBRARY_DIRS})
 
 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}")
@@ -77,6 +77,16 @@ find_package(BZip2 REQUIRED)
 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 by -DPHP_BIN=/path/php ")
+endif()
+message (STATUS "Setting PHP_BIN= " ${PHP_BIN})
+
 #-----------------------------------------------------------------------------
 #
 # Setup settings and paths
@@ -101,6 +111,7 @@ set(CUSTOMFILES
     utils/query.php
     utils/server_compare.php
     utils/setup.php
+    utils/setup_functions.php
     utils/specialphrases.php
     utils/update.php
     utils/warm.php