made compilable on Ubuntu 22.04

melowntech · May 25, 2022 · 87ae520 · 87ae520
1 parent 241ba43
commit 87ae520
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 18 deletions.
diff --git a/externals/buildsys/cmake b/externals/buildsys/cmake
diff --git a/externals/buildsys/common b/externals/buildsys/common
diff --git a/externals/gdal-drivers b/externals/gdal-drivers
diff --git a/externals/libdbglog b/externals/libdbglog
diff --git a/externals/libgeo b/externals/libgeo
diff --git a/externals/libgeometry b/externals/libgeometry
diff --git a/externals/libimgproc b/externals/libimgproc
diff --git a/externals/libjsoncpp b/externals/libjsoncpp
diff --git a/externals/libmath b/externals/libmath
diff --git a/externals/libminiball b/externals/libminiball
diff --git a/externals/libpydbglog b/externals/libpydbglog
diff --git a/externals/libpysupport b/externals/libpysupport
diff --git a/externals/libsemantic b/externals/libsemantic
diff --git a/externals/libservice b/externals/libservice
diff --git a/externals/libutility b/externals/libutility
diff --git a/externals/vts-libs b/externals/vts-libs
diff --git a/mapproxy/CMakeLists.txt b/mapproxy/CMakeLists.txt
@@ -60,7 +60,7 @@ find_package(LibProc REQUIRED)
 include_directories(${LIBPROC_INCLUDE_DIR})
 
 find_package(Eigen3 REQUIRED)
-include_directories(${EIGEN3_INCLUDE_DIR})
+include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR})
 
 find_package(ICU COMPONENTS uc i18n REQUIRED)
 include_directories(${ICU_INCLUDE_DIRS})
@@ -74,6 +74,11 @@ include_directories(${TINYXML2_INCLUDE_DIR})
 find_package(Markdown REQUIRED)
 include_directories(${Markdown_INCLUDE_DIR})
 
+find_package(MGTS REQUIRED)
+include_directories(${MGTS_INCLUDE_DIRS})
+find_package(GLIB REQUIRED)
+include_directories(${GLIB_INCLUDE_DIRS})
+
 # dependencies
 add_subdirectory(src/dbglog)
 add_subdirectory(src/utility)

diff --git a/mapproxy/src/generatevrtwo/generatevrtwo.cpp b/mapproxy/src/generatevrtwo/generatevrtwo.cpp
@@ -396,7 +396,11 @@ void VrtDs::addSimpleSource(int band, const fs::path &filename
 
     // try to create simple source from parsed string
     std::unique_ptr< ::VRTSimpleSource> src(new ::VRTSimpleSource());
-#if GDAL_VERSION_NUM >= 3000000
+#if GDAL_VERSION_NUM >= 3040000
+    std::map<CPLString, GDALDataset*> dsMap;
+    if (src->XMLInit(xmlNodeFromString(os.str()).get(), nullptr
+                     , dsMap) != CE_None)
+#elif GDAL_VERSION_NUM >= 3000000
     std::map<CPLString, GDALDataset*> dsMap;
     if (src->XMLInit(xmlNodeFromString(os.str()).get(), nullptr, nullptr
                      , dsMap) != CE_None)
+78 −0		Modules.Conan/FindBoost.cmake
+12 −0		Modules.Conan/FindCatch2.cmake
+32 −0		Modules.Conan/FindCbc.cmake
+10 −0		Modules.Conan/FindCeres.cmake
+11 −0		Modules.Conan/FindCrypto++.cmake
+7 −0		Modules.Conan/FindEXIF.cmake
+15 −0		Modules.Conan/FindEigen3.cmake
+7 −0		Modules.Conan/FindFFTW3.cmake
+12 −0		Modules.Conan/FindGDAL.cmake
+7 −0		Modules.Conan/FindGeographicLib.cmake
+7 −0		Modules.Conan/FindIlmBase.cmake
+7 −0		Modules.Conan/FindJPEG.cmake
+21 −0		Modules.Conan/FindJsonCPP.cmake
+7 −0		Modules.Conan/FindLASzip.cmake
+10 −0		Modules.Conan/FindMETIS.cmake
+7 −0		Modules.Conan/FindMGTS.cmake
+7 −0		Modules.Conan/FindMySQL++.cmake
+10 −0		Modules.Conan/FindNumPy.cmake
+7 −0		Modules.Conan/FindOpenCV.cmake
+7 −0		Modules.Conan/FindOpenEXR.cmake
+9 −0		Modules.Conan/FindOpenMVG.cmake
+7 −0		Modules.Conan/FindOpenMesh.cmake
+11 −0		Modules.Conan/FindOpenVDB.cmake
+7 −0		Modules.Conan/FindPDAL.cmake
+7 −0		Modules.Conan/FindPNG.cmake
+7 −0		Modules.Conan/FindProj.cmake
+7 −0		Modules.Conan/FindTIFF.cmake
+7 −0		Modules.Conan/Findglog.cmake
+7 −0		Modules.Conan/Findlibshp.cmake
+8 −0		Modules.Conan/FindmyVRPointCloud.cmake
+7 −0		Modules.Conan/Findyaml-cpp.cmake
+0 −16		Modules.Win32/FindGDAL.cmake
+0 −22		Modules.Win32/FindJPEG.cmake
+0 −37		Modules.Win32/FindJsonCPP.cmake
+0 −22		Modules.Win32/FindPNG.cmake
+0 −16		Modules.Win32/FindProj.cmake
+36 −0		Modules.Win32/FindPyTorch.cmake
+18 −0		Modules.Win32/FindPyTorch.py
+42 −0		Modules.Win32/FindTensorFlow.cmake
+35 −0		Modules.Win32/FindTensorFlow.py
+41 −0		Modules/FindCatch.cmake
+20 −0		Modules/FindCbc.cmake
+28 −50		Modules/FindLASzip.cmake
+1 −1		Modules/FindNumPy.cmake
+12 −1		Modules/FindProj.cmake
+37 −34		Modules/FindTBB.cmake
+27 −0		Modules/Findmodbus.cmake
+31 −15		buildsys.cmake
+12 −2		cmake.mk
+12 −2		include/debian.mk
+14 −4		macros/build-types/customerdebug.cmake
+14 −4		macros/build-types/customerrelease.cmake
+28 −4		macros/cuda.cmake
+3 −1		macros/customer.cmake
+24 −0		macros/exclude-from-all.cmake
+163 −0		macros/install-conan-deps.cmake
+2 −2		macros/library-support.cmake
+10 −4		macros/openmp.cmake
+18 −0		macros/output-paths.cmake
+27 −10		macros/python.cmake
+15 −0		macros/torch.cmake
+15 −13		tools/pathstrip/pathstrip.cmake
+10 −0		common.mk
+27 −11		deb-prepare.sh
+1 −0		deb-releases.mk
+18 −0		deb.bin/deb-installconffiles
+76 −15		deb.mk
+23 −0		dput.cf
+30 −0		git.mk
+7 −0		git/branch.sh
+7 −0		git/hash.sh
+10 −0		git/remove-branch-config.sh
+57 −0		help-deb.txt
+22 −0		help.txt
+0 −0		src.bin/tar
+2 −1		gdal-drivers/CMakeLists.txt
+2 −7		gdal-drivers/blender.cpp
+8 −6		gdal-drivers/blender.hpp
+93 −0		gdal-drivers/detail/srsholder.hpp
+3 −3		gdal-drivers/mvt.hpp
+2 −2		gdal-drivers/python/CMakeLists.txt
+4 −0		gdal-drivers/python/gdaldriversmodule.cpp
+1 −1		gdal-drivers/python/gdaldriversmodule.hpp
+3 −7		gdal-drivers/solid.cpp
+4 −4		gdal-drivers/solid.hpp
+2 −2		dbglog/CMakeLists.txt
+6 −0		dbglog/dbglog.hpp
+7 −0		dbglog/logger.hpp
+10 −2		dbglog/sink.hpp
+4 −0		dbglog/stream.hpp
+2 −2		geo/CMakeLists.txt
+22 −0		geo/coordinates.hpp
+90 −7		geo/csconvertor.cpp
+10 −1		geo/csconvertor.hpp
+18 −0		geo/detail/ovrdataset.new.cpp
+11 −1		geo/detail/project.6.cpp
+17 −9		geo/detail/project.pre6.cpp
+4 −1		geo/featurelayers.cpp
+77 −1		geo/geodataset.cpp
+18 −1		geo/geodataset.hpp
+2 −0		geo/project.hpp
+2 −1		geo/python/CMakeLists.txt
+11 −18		geo/python/geomodule.cpp
+1 −1		geo/python/geomodule.hpp
+18 −7		geo/srsdef.cpp
+8 −20		geo/srsfactors.cpp
+10 −18		geometry/CMakeLists.txt
+53 −92		geometry/delaunay2d.cpp
+4 −37		geometry/delaunay2d.hpp
+46 −0		geometry/detail/parse-obj.hpp
+3 −2		geometry/estimate-point-normals.hpp
+63 −0		geometry/gtsutils.cpp
+41 −0		geometry/gtsutils.hpp
+204 −0		geometry/meshclip.cpp
+1 −3		geometry/meshop-bio.cpp
+7 −52		geometry/meshop-gts.cpp
+129 −50		geometry/meshop.cpp
+76 −7		geometry/meshop.hpp
+210 −0		geometry/multipolygon-triangulate-gts.cpp
+89 −0		geometry/multipolygon-triangulate-gts.hpp
+60 −0		geometry/multipolymesh.cpp
+286 −0		geometry/multipolymesh.hpp
+33 −12		geometry/nonconvexclip.cpp
+3 −0		geometry/parse-obj.hpp
+305 −0		geometry/parse-ply.cpp
+186 −0		geometry/parse-ply.hpp
+0 −1		geometry/pointcloud.cpp
+1 −1		geometry/pointcloud.hpp
+63 −2		geometry/polygon.hpp
+2 −1		geometry/python/CMakeLists.txt
+7 −1		geometry/python/geometrymodule.cpp
+1 −1		geometry/python/geometrymodule.hpp
+19 −7		geometry/test-tools/obj.cpp
+39 −25		geometry/triangulate.cpp
+8 −8		geometry/triclip.hpp
+4 −5		geometry/volume.cpp
+1 −2		geometry/volume.hpp
+1 −1		geometry/volumeop.hpp
+15 −1		imgproc/CMakeLists.txt
+21 −10		imgproc/binterpolate.hpp
+29 −2		imgproc/const-raster.hpp
+4 −0		imgproc/crop.hpp
+4 −7		imgproc/exif.hpp
+40 −0		imgproc/exr.cpp
+40 −0		imgproc/exr.hpp
+9 −5		imgproc/filtering.hpp
+4 −1		imgproc/histogram.hpp
+14 −0		imgproc/imagesize.cpp
+1 −1		imgproc/imgwarp.cpp
+1 −1		imgproc/inpaint.hpp
+2 −1		imgproc/python/CMakeLists.txt
+5 −0		imgproc/python/imgprocmodule.cpp
+1 −1		imgproc/python/imgprocmodule.hpp
+7 −0		imgproc/rasterizer.hpp
+17 −0		imgproc/rastermask/quadtree.cpp
+2 −0		imgproc/rastermask/quadtree.hpp
+180 −0		imgproc/sharpen.cpp
+77 −0		imgproc/sharpen.hpp
+24 −5		imgproc/texturing.cpp
+27 −7		imgproc/texturing.hpp
+1 −1		math/CMakeLists.txt
+67 −0		math/detail/point.inline.hpp
+4 −2		math/extent.hpp
+68 −2		math/geometry.cpp
+142 −10		math/geometry.hpp
+31 −19		math/geometry_core.hpp
+3 −1		math/python/CMakeLists.txt
+6 −0		math/python/mathmodule.cpp
+1 −1		math/python/mathmodule.hpp
+1 −1		miniball/adapter.hpp
+1 −0		miniball/miniball
+0 −2		miniball/miniball.cpp
+1 −1		miniball/miniball.hpp
+8 −0		pydbglog/CMakeLists.txt
+19 −6		pydbglog/dbglogmodule.cpp