From 38304136d31c88bc0e2294c4b62d83cf124c1dcf Mon Sep 17 00:00:00 2001 From: ThomasBarris Date: Mon, 20 Aug 2018 17:24:20 +0200 Subject: [PATCH] Allow custom locations for PHP binary - part 1 --- CMakeLists.txt | 10 ++++++++++ settings/defaults.php | 1 + 2 files changed, 11 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2096c43d..afd81594 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/settings/defaults.php b/settings/defaults.php index 8cdbcb5a..8fc5b89e 100644 --- a/settings/defaults.php +++ b/settings/defaults.php @@ -47,6 +47,7 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true); @define('CONST_ExtraDataPath', CONST_BasePath.'/data'); @define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql'); @define('CONST_Pyosmium_Binary', '@PYOSMIUM_PATH@'); +@define('CONST_PHP_Binary', '@PHP_BIN@'); @define('CONST_Tiger_Data_Path', CONST_ExtraDataPath.'/tiger'); @define('CONST_Wikipedia_Data_Path', CONST_ExtraDataPath); -- 2.45.2