]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge pull request #581 from lonvia/update-osm2pgsql
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 20 Nov 2016 16:00:43 +0000 (17:00 +0100)
committerGitHub <noreply@github.com>
Sun, 20 Nov 2016 16:00:43 +0000 (17:00 +0100)
update osm2pgsql

CMakeLists.txt
osm2pgsql

index 65254b1c2cda88510eabf0905d32f5a9ceb83db6..324b5c915ae21fbe4a5231d2cf13aa91f243e103 100644 (file)
@@ -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)
 
index d0af11f267a202c7c1961c2061d121c726d8db3a..06a37319125079250cb0406ae0f8018f35301ccc 160000 (submodule)
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit d0af11f267a202c7c1961c2061d121c726d8db3a
+Subproject commit 06a37319125079250cb0406ae0f8018f35301ccc