Merge pull request #1902 from lonvia/avoid-touching-boundaries-in-addresses

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae611885227409986d6aca96f7ee334a74d33c66..787baeb23de7e0c9afb7621024d2f448b2c63391 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 4)
+set(NOMINATIM_VERSION_MINOR 5)
 set(NOMINATIM_VERSION_PATCH 0)
 
 set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")
@@ -79,14 +79,16 @@ endif()
 
 # 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 ")
+if (BUILD_API OR BUILD_IMPORTER)
+    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})
 endif()
-message (STATUS "Using PHP binary " ${PHP_BIN})
 
 #-----------------------------------------------------------------------------
 # import scripts and utilities (importer only)
@@ -94,6 +96,7 @@ message (STATUS "Using PHP binary " ${PHP_BIN})
 
 if (BUILD_IMPORTER)
    set(CUSTOMSCRIPTS
+       utils/check_import_finished.php
        utils/country_languages.php
        utils/importWikipedia.php
        utils/export.php
@@ -138,6 +141,11 @@ if (BUILD_API)
            COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/
        )
    endforeach()
+
+   add_custom_target(serve
+           php -S 127.0.0.1:8088
+           WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website
+   )
 endif()
 
 #-----------------------------------------------------------------------------