fix stat command; link lmdb as static library

protomaps · Sep 3, 2019 · 3e82a59 · 3e82a59
1 parent 566b724
commit 3e82a59
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ add_subdirectory(vendor/CRoaring EXCLUDE_FROM_ALL)
 add_subdirectory(vendor/capnproto)
 add_subdirectory(vendor/s2geometry EXCLUDE_FROM_ALL)
 
-add_custom_target(liblmdb COMMAND make
+add_custom_target(build_lmdb COMMAND make
                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/vendor/lmdb/libraries/liblmdb
 )
 
@@ -29,8 +29,8 @@ link_directories(vendor/capnproto/c++/src/capnp)
 link_directories(vendor/capnproto/c++/src/kj)
 
 add_executable(osmx src/cmd.cpp src/storage.cpp src/expand.cpp src/extract.cpp src/update.cpp src/region.cpp)
-add_dependencies(osmx liblmdb s2)
-target_link_libraries(osmx lmdb z expat bz2 s2 capnp kj roaring)
+add_dependencies(osmx build_lmdb s2)
+target_link_libraries(osmx z expat bz2 s2 capnp kj roaring ${CMAKE_SOURCE_DIR}/vendor/lmdb/libraries/liblmdb/liblmdb.a)
 set_property(TARGET osmx PROPERTY CXX_STANDARD 14)
 add_executable(osmxTest test/test_region.cpp src/region.cpp)
 set_property(TARGET osmxTest PROPERTY CXX_STANDARD 14)

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ OSM Express is being used in production, but should still be considered experime
 osmx expand planet.osm.pbf planet.osmx # converts a pbf or xml to osmx. Takes 5-10 hours for the planet, resulting in a ~600GB file.
 osmx extract planet.osmx extract.osm.pbf --bbox 40.7411\,-73.9937\,40.7486\,-73.9821 # extract a new pbf for the given bounding box.
 osmx update planet.osmx 3648548.osc 3648548 2019-08-29T17:50:02Z --commit # applies an OsmChange diff.
-osmx stat planet.osmx # Print statistics, seqnum and timestamp.
+osmx query planet.osmx # Print statistics, seqnum and timestamp.
 osmx query planet.osmx way 34633854 # look up an element by ID.
 ```