Merge pull request #2284 from joto/middle-prepare

Middle refactor for SQL code
osm2pgsql-dev · Jan 6, 2025 · 9b568ee · 9b568ee
2 parents 686d760 + 6259590
commit 9b568ee
Show file tree

Hide file tree

Showing 10 changed files with 297 additions and 268 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -266,9 +266,7 @@ else()
                 src/gen/gen-tile-sql.cpp
                 src/gen/gen-tile-vector.cpp
                 src/gen/gen-tile.cpp
-                src/gen/params.cpp
                 src/gen/raster.cpp
-                src/gen/template.cpp
                 src/gen/tracer.cpp)
     target_link_libraries(osm2pgsql-gen osm2pgsql_lib ${LIBS} ${POTRACE_LIBRARY} ${OpenCV_LIBS})
 endif()

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -47,6 +47,7 @@ target_sources(osm2pgsql_lib PRIVATE
     output-null.cpp
     output-pgsql.cpp
     output.cpp
+    params.cpp
     pgsql-capabilities.cpp
     pgsql-helper.cpp
     pgsql.cpp
@@ -58,6 +59,7 @@ target_sources(osm2pgsql_lib PRIVATE
     tagtransform-c.cpp
     tagtransform-lua.cpp
     tagtransform.cpp
+    template.cpp
     thread-pool.cpp
     tile.cpp
     util.cpp