safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Set osmosis if available

Browse Source
This commit is contained in:
Melvyn Sopacua
2017-02-17 17:00:15 +01:00
committed by Sarah Hoffmann
parent e77a07cbb3
commit 66d7f1a058
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -42,6 +42,15 @@ unset(PostgreSQL_TYPE_INCLUDE_DIR CACHE)
set(PostgreSQL_TYPE_INCLUDE_DIR "/usr/include/")
find_package(PostgreSQL REQUIRED)
include_directories(${PostgreSQL_INCLUDE_DIRS})
find_program(OSMOSIS osmosis)
if (NOT EXISTS "${OSMOSIS}")
set(OSMOSIS_PATH "/nonexistent")
message(WARNING "Osmosis not found (required for updates)")
else()
set(OSMOSIS_PATH "${OSMOSIS}")
message(STATUS "Using osmosis at ${OSMOSIS_PATH}")
endif()
find_program(PG_CONFIG pg_config)
execute_process(COMMAND ${PG_CONFIG} --pgxs

2
settings/defaults.php
View File

@@ -40,7 +40,7 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
// Paths
@define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql');
@define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
@define('CONST_Osmosis_Binary', '@OSMOSIS_PATH@');
@define('CONST_Tiger_Data_Path', CONST_BasePath.'/data/tiger');
@define('CONST_Wikipedia_Data_Path', CONST_BasePath.'/data');