re-add building of wheels

Author: lonvia

CMakeLists.txt

@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.15...4.0)
 project(osmium LANGUAGES CXX)
 
+option(WITH_LZ4 "Build with lz4 support for PBF files" ON)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+message(STATUS "Module path: ${CMAKE_MODULE_PATH}")
+
 set(PYBIND11_FINDPYTHON ON)
 find_package(pybind11 CONFIG REQUIRED)
 
@@ -30,4 +35,68 @@ else()
 #######################################################################
 # wheel build
 #
+
+set(OSMIUM_COMPONENTS io pbf xml)
+
+if(WITH_LZ4)
+  find_package(LZ4)
+  if (LZ4_FOUND)
+    list(APPEND OSMIUM_COMPONENTS lz4)
+    message(STATUS "lz4 library found, compiling with it")
+  else()
+    message(WARNING "lz4 library not found, compiling without it")
+  endif()
+else()
+  message(STATUS "Building without lz4 support: Set WITH_LZ4=ON to change this")
+endif()
+
+find_package(Osmium 2.16 REQUIRED COMPONENTS ${OSMIUM_COMPONENTS})
+include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS})
+
+if(NOT "${CMAKE_CXX_STANDARD}")
+    set(CMAKE_CXX_STANDARD 17)
+endif()
+
+message(STATUS "Building in C++${CMAKE_CXX_STANDARD} mode")
+
+find_package(Boost 1.55 REQUIRED COMPONENTS)
+include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+
+# Modules without any Python code and just one source file.
+foreach(PYMOD geom index io area)
+    pybind11_add_module(${PYMOD} lib/${PYMOD}.cc)
+    target_link_libraries(${PYMOD} PRIVATE ${OSMIUM_LIBRARIES})
+    install(TARGETS ${PYMOD} DESTINATION osmium)
+endforeach()
+
+# Modules where additional Python code is in src (C++-part will be private).
+foreach(PYMOD osm replication)
+    pybind11_add_module(_${PYMOD} lib/${PYMOD}.cc)
+    target_link_libraries(_${PYMOD} PRIVATE ${OSMIUM_LIBRARIES})
+    install(TARGETS _${PYMOD} DESTINATION osmium/${PYMOD})
+endforeach()
+
+# Modules with multiple source files.
+pybind11_add_module(_osmium
+                    lib/osmium.cc
+                    lib/merge_input_reader.cc
+                    lib/node_location_handler.cc
+                    lib/simple_writer.cc
+                    lib/file_iterator.cc
+                    lib/id_tracker.cc)
+install(TARGETS _osmium DESTINATION osmium)
+target_link_libraries(_osmium PRIVATE ${OSMIUM_LIBRARIES})
+
+pybind11_add_module(filter
+                    lib/filter.cc
+                    lib/empty_tag_filter.cc
+                    lib/key_filter.cc
+                    lib/tag_filter.cc
+                    lib/id_filter.cc
+                    lib/entity_filter.cc
+                    lib/geo_interface_filter.cc)
+install(TARGETS filter DESTINATION osmium)
+target_link_libraries(filter PRIVATE ${OSMIUM_LIBRARIES})
+
+
 endif()

cmake/FindOsmium.cmake

@@ -55,19 +55,10 @@
 #
 #----------------------------------------------------------------------
 
-# This is the list of directories where we look for osmium includes.
-set(_osmium_include_path
-        ../libosmium
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /opt/local # DarwinPorts
-        /opt
-)
-
 # Look for the header file.
 find_path(OSMIUM_INCLUDE_DIR osmium/version.hpp
     PATH_SUFFIXES include
-    PATHS ${_osmium_include_path}
+    HINTS $ENV{LIBOSMIUM_PREFIX} ${CMAKE_SOURCE_DIR}/contrib/libosmium
 )
 
 # Check libosmium version number

cmake/FindProtozero.cmake

@@ -39,7 +39,7 @@
 # find include path
 find_path(PROTOZERO_INCLUDE_DIR protozero/version.hpp
     PATH_SUFFIXES include
-    PATHS ${CMAKE_SOURCE_DIR}/../protozero
+    HINTS $ENV{PROTOZERO_PREFIX} ${CMAKE_SOURCE_DIR}/contrib/protozero
 )
 
 # Check version number