cmake: force-set options and explicitly check for pgxs makefile

fixes #443
This commit is contained in:
Sarah Hoffmann 2016-05-23 22:20:59 +02:00
parent ce112f7c20
commit 362f259f47

View File

@ -32,8 +32,8 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
# #
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
set(BUILD_TESTS on) set(BUILD_TESTS on CACHE BOOL "Build test suite" FORCE)
set(WITH_LUA off) set(WITH_LUA off CACHE BOOL "Build with lua support" FORCE)
add_subdirectory(osm2pgsql) add_subdirectory(osm2pgsql)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
@ -48,6 +48,10 @@ execute_process(COMMAND ${PG_CONFIG} --pgxs
OUTPUT_VARIABLE PGXS OUTPUT_VARIABLE PGXS
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
if (NOT EXISTS "${PGXS}")
message(FATAL_ERROR "Postgresql server package not found.")
endif()
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
find_package(BZip2 REQUIRED) find_package(BZip2 REQUIRED)