X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ec8963f3d2e18a197aee8576889400fb058150d3..0df5f77bc4c92e2f8f635105441779277435da67:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 347f4d48..7c5763fd 100644 --- 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}") @@ -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 with -DPHP_BIN=/path/php ") +endif() +message (STATUS "Using PHP binary " ${PHP_BIN}) + #----------------------------------------------------------------------------- # # Setup settings and paths @@ -103,7 +113,6 @@ set(CUSTOMFILES website/taginfo.json utils/blocks.php utils/country_languages.php - utils/imports.php utils/importWikipedia.php utils/export.php utils/query.php