hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure osm2pgsql and module location via cmake

Browse Source 
The default location of osm2pgsql and the postgresql module
is decided at compile/installation time and is not necessarily
in the project directory.

With this change it is now possible to have a project directory
that is completely separate from the build directory.
This commit is contained in:
Sarah Hoffmann
2021-01-04 11:37:56 +01:00
parent cba2d252c8
commit 5e989b9296
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/script.tmpl
View File

@@ -1,5 +1,7 @@
#!@PHP_BIN@ -Cq #!@PHP_BIN@ -Cq
<?php <?php
@define('CONST_Default_ModulePath', '@CMAKE_BINARY_DIR@/module');
@define('CONST_Default_Osm2pgsql', '@CMAKE_BINARY_DIR@/osm2pgsql/osm2pgsql');
@define('CONST_BinDir', '@CMAKE_SOURCE_DIR@/utils'); @define('CONST_BinDir', '@CMAKE_SOURCE_DIR@/utils');
@define('CONST_LibDir', '@CMAKE_SOURCE_DIR@/lib'); @define('CONST_LibDir', '@CMAKE_SOURCE_DIR@/lib');
@define('CONST_DataDir', '@CMAKE_SOURCE_DIR@'); @define('CONST_DataDir', '@CMAKE_SOURCE_DIR@');

5
lib/setup/SetupClass.php
View File

@@ -42,7 +42,7 @@ class SetupFunctions
$this->iCacheMemory = getCacheMemoryMB(); $this->iCacheMemory = getCacheMemoryMB();
} }
$this->sModulePath = getSetting('DATABASE_MODULE_PATH', CONST_InstallDir.'/module'); $this->sModulePath = getSetting('DATABASE_MODULE_PATH', CONST_Default_ModulePath);
info('module path: ' . $this->sModulePath); info('module path: ' . $this->sModulePath);
// parse database string // parse database string
@@ -736,9 +736,6 @@ class SetupFunctions
fwriteConstDef($rFile, 'LibDir', CONST_LibDir); fwriteConstDef($rFile, 'LibDir', CONST_LibDir);
fwriteConstDef($rFile, 'DataDir', CONST_DataDir); fwriteConstDef($rFile, 'DataDir', CONST_DataDir);
fwriteConstDef($rFile, 'InstallDir', CONST_InstallDir); fwriteConstDef($rFile, 'InstallDir', CONST_InstallDir);
fwrite($rFile, "if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SETTINGS'));\n\n");
fwriteConstDef($rFile, 'Database_DSN', getSetting('DATABASE_DSN')); fwriteConstDef($rFile, 'Database_DSN', getSetting('DATABASE_DSN'));
fwriteConstDef($rFile, 'Default_Language', getSetting('DEFAULT_LANGUAGE')); fwriteConstDef($rFile, 'Default_Language', getSetting('DEFAULT_LANGUAGE'));
fwriteConstDef($rFile, 'Log_DB', getSettingBool('LOG_DB')); fwriteConstDef($rFile, 'Log_DB', getSettingBool('LOG_DB'));

7
lib/setup_functions.php
View File

@@ -17,12 +17,7 @@ function checkInFile($sOSMFile)
function getOsm2pgsqlBinary() function getOsm2pgsqlBinary()
{ {
$sBinary = getSetting('OSM2PGSQL_BINARY'); return getSetting('OSM2PGSQL_BINARY', CONST_Default_Osm2pgsql);
if (!$sBinary) {
$sBinary = CONST_InstallDir.'/osm2pgsql/osm2pgsql';
}
return $sBinary;
} }
function getImportStyle() function getImportStyle()