From 362f259f47b4e45dea732bb21bd7c4f91ffe916e Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Mon, 23 May 2016 22:20:59 +0200 Subject: [PATCH] cmake: force-set options and explicitly check for pgxs makefile fixes #443 --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dca35eca..6e11e7b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,8 +32,8 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}") # #----------------------------------------------------------------------------- -set(BUILD_TESTS on) -set(WITH_LUA off) +set(BUILD_TESTS on CACHE BOOL "Build test suite" FORCE) +set(WITH_LUA off CACHE BOOL "Build with lua support" FORCE) add_subdirectory(osm2pgsql) find_package(Threads REQUIRED) @@ -48,6 +48,10 @@ execute_process(COMMAND ${PG_CONFIG} --pgxs OUTPUT_VARIABLE PGXS OUTPUT_STRIP_TRAILING_WHITESPACE) +if (NOT EXISTS "${PGXS}") + message(FATAL_ERROR "Postgresql server package not found.") +endif() + find_package(ZLIB REQUIRED) find_package(BZip2 REQUIRED)