Skip to content

Commit

Permalink
Set osmosis if available
Browse files Browse the repository at this point in the history
  • Loading branch information
melvyn-sopacua authored and lonvia committed Feb 18, 2017
1 parent e77a07c commit 66d7f1a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
9 changes: 9 additions & 0 deletions CMakeLists.txt
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion settings/defaults.php
Expand Up @@ -40,7 +40,7 @@

// 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');

Expand Down

0 comments on commit 66d7f1a

Please sign in to comment.