Merge branch 'interpolations'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dca35eca4449fe7b7756e9a0282aa779b975ca3c..6e11e7b85e37d46abfb7e420882006e2561b8c25 100644 (file)
--- 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)

diff --git a/module/CMakeLists.txt b/module/CMakeLists.txt
index 5e507a9e8eb2ee6037192b779f1e9afa4506b3a4..4dfc477cd8684a30a81791f99f8541c9ed0863b3 100644 (file)
--- a/module/CMakeLists.txt
+++ b/module/CMakeLists.txt
@@ -1,6 +1,6 @@
 # just use the pgxs makefile
 ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dummy
-        COMMAND PGXS=${PGXS} PG_CONFIG=${PG_CONFIG} make -f ${CMAKE_CURRENT_SOURCE_DIR}/Makefile
+        COMMAND PGXS=${PGXS} PG_CONFIG=${PG_CONFIG} MODSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} make -f ${CMAKE_CURRENT_SOURCE_DIR}/Makefile
         COMMENT "Running external makefile ${PGXS}"
         )
 

diff --git a/module/Makefile b/module/Makefile
index 783a6602b628c099ed25478e3553cc57e3e68e72..78b395a564daf91600332694afebbd0d4dba317c 100644 (file)
--- a/module/Makefile
+++ b/module/Makefile
@@ -1,4 +1,5 @@
 MODULES = nominatim
+VPATH = $(MODSRCDIR)
 include $(PGXS)
 
 all: