From: Sarah Hoffmann Date: Sun, 20 Nov 2016 16:00:43 +0000 (+0100) Subject: Merge pull request #581 from lonvia/update-osm2pgsql X-Git-Tag: v3.0.0~89 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/de01c5b23da43462741a0f0e9d9f1e35fe784a0e?hp=b27926fd4d96e0bcb0471543e4f29c14752f43e2 Merge pull request #581 from lonvia/update-osm2pgsql update osm2pgsql --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 65254b1c..324b5c91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}") # #----------------------------------------------------------------------------- -set(BUILD_TESTS on CACHE BOOL "Build test suite" FORCE) +set(BUILD_TESTS off CACHE BOOL "Build test suite" FORCE) set(WITH_LUA off CACHE BOOL "Build with lua support" FORCE) add_subdirectory(osm2pgsql) diff --git a/osm2pgsql b/osm2pgsql index d0af11f2..06a37319 160000 --- a/osm2pgsql +++ b/osm2pgsql @@ -1 +1 @@ -Subproject commit d0af11f267a202c7c1961c2061d121c726d8db3a +Subproject commit 06a37319125079250cb0406ae0f8018f35301ccc