Skip to content

Commit a17537d

Browse files
committed
update libosmium dependency to 2.23.0
1 parent 50bff71 commit a17537d

2 files changed

Lines changed: 1 addition & 54 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ include(FetchContent)
1919

2020
FetchContent_Declare(libosmium
2121
GIT_REPOSITORY https://github.com/osmcode/libosmium
22-
GIT_TAG 85aa0ec170d99b432d29a372554b27491d28065e # release 2.22.0
22+
GIT_TAG 9c49c960569c15dd09ff9eb9e9dce7f383ab6ed2 # release 2.23.0
2323
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/contrib/libosmium
2424
SOURCE_SUBDIR cmake
2525
GIT_SUBMODULES_RECURSE OFF)

cmake/FindOsmium.cmake

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
# io - include libraries needed for any type of input/output
3333
# geos - include if you want to use any of the GEOS functions
3434
# gdal - include if you want to use any of the OGR functions
35-
# proj - include if you want to use any of the Proj.4 functions
36-
# sparsehash - include if you use the sparsehash index
3735
# lz4 - include support for LZ4 compression of PBF files
3836
#
3937
# You can check for success with something like this:
@@ -196,56 +194,6 @@ if(Osmium_USE_GDAL)
196194
endif()
197195
endif()
198196

199-
#----------------------------------------------------------------------
200-
# Component 'proj'
201-
if(Osmium_USE_PROJ)
202-
find_path(PROJ_INCLUDE_DIR proj_api.h)
203-
find_library(PROJ_LIBRARY NAMES proj)
204-
205-
list(APPEND OSMIUM_EXTRA_FIND_VARS PROJ_INCLUDE_DIR PROJ_LIBRARY)
206-
if(PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
207-
set(PROJ_FOUND 1)
208-
list(APPEND OSMIUM_LIBRARIES ${PROJ_LIBRARY})
209-
list(APPEND OSMIUM_INCLUDE_DIRS ${PROJ_INCLUDE_DIR})
210-
else()
211-
message(WARNING "Osmium: PROJ.4 library is required but not found, please install it or configure the paths.")
212-
endif()
213-
endif()
214-
215-
#----------------------------------------------------------------------
216-
# Component 'sparsehash'
217-
if(Osmium_USE_SPARSEHASH)
218-
find_path(SPARSEHASH_INCLUDE_DIR google/sparsetable)
219-
220-
list(APPEND OSMIUM_EXTRA_FIND_VARS SPARSEHASH_INCLUDE_DIR)
221-
if(SPARSEHASH_INCLUDE_DIR)
222-
# Find size of sparsetable::size_type. This does not work on older
223-
# CMake versions because they can do this check only in C, not in C++.
224-
if(NOT CMAKE_VERSION VERSION_LESS 3.0)
225-
include(CheckTypeSize)
226-
set(CMAKE_REQUIRED_INCLUDES ${SPARSEHASH_INCLUDE_DIR})
227-
set(CMAKE_EXTRA_INCLUDE_FILES "google/sparsetable")
228-
check_type_size("google::sparsetable<int>::size_type" SPARSETABLE_SIZE_TYPE LANGUAGE CXX)
229-
set(CMAKE_EXTRA_INCLUDE_FILES)
230-
set(CMAKE_REQUIRED_INCLUDES)
231-
else()
232-
set(SPARSETABLE_SIZE_TYPE ${CMAKE_SIZEOF_VOID_P})
233-
endif()
234-
235-
# Sparsetable::size_type must be at least 8 bytes (64bit), otherwise
236-
# OSM object IDs will not fit.
237-
if(SPARSETABLE_SIZE_TYPE GREATER 7)
238-
set(SPARSEHASH_FOUND 1)
239-
add_definitions(-DOSMIUM_WITH_SPARSEHASH=${SPARSEHASH_FOUND})
240-
list(APPEND OSMIUM_INCLUDE_DIRS ${SPARSEHASH_INCLUDE_DIR})
241-
else()
242-
message(WARNING "Osmium: Disabled Google SparseHash library on 32bit system (size_type=${SPARSETABLE_SIZE_TYPE}).")
243-
endif()
244-
else()
245-
message(WARNING "Osmium: Google SparseHash library is required but not found, please install it or configure the paths.")
246-
endif()
247-
endif()
248-
249197
#----------------------------------------------------------------------
250198

251199
list(REMOVE_DUPLICATES OSMIUM_INCLUDE_DIRS)
@@ -281,7 +229,6 @@ find_package_handle_standard_args(Osmium
281229
REQUIRED_VARS OSMIUM_INCLUDE_DIR ${OSMIUM_EXTRA_FIND_VARS}
282230
VERSION_VAR _libosmium_version)
283231
unset(OSMIUM_EXTRA_FIND_VARS)
284-
set(OSMIUM_VERSION ${_libosmium_version})
285232

286233
#----------------------------------------------------------------------
287234
#

0 commit comments

Comments
 (0)