Merge pull request #2153 from rizkyarlin/patch-1

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd73870502a947c62510fbeb57c992b9fd915539..c6f63a8b4366e146570ad2b34d33e486087886b4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,8 +86,19 @@ if (BUILD_API OR BUILD_IMPORTER)
     # 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 ")
+    else()
+        message (STATUS "Using PHP binary " ${PHP_BIN})
+    endif()
+    if (NOT PHPCGI_BIN)
+        find_program (PHPCGI_BIN php-cgi)
+    endif()
+    # sanity check if PHP binary exists
+    if (NOT EXISTS ${PHPCGI_BIN})
+        message(WARNING "php-cgi binary not found. nominatim tool will not provide query functions.")
+        set (PHPCGI_BIN "")
+    else()
+        message (STATUS "Using php-cgi binary " ${PHPCGI_BIN})
     endif()
-    message (STATUS "Using PHP binary " ${PHP_BIN})
 endif()
 
 #-----------------------------------------------------------------------------
@@ -142,7 +153,7 @@ if (BUILD_TESTS)
 
     find_program(PYTHON_BEHAVE behave)
     find_program(PYLINT NAMES pylint3 pylint)
-    find_program(PYTEST pytest)
+    find_program(PYTEST NAMES pytest py.test-3 py.test)
     find_program(PHPCS phpcs)
     find_program(PHPUNIT phpunit)