found 7zip in C:\Program Files\7-Zip\7z.exe set PATH=E:\buildsystem\release-1930-x64\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\\Extensions\Microsoft\IntelliCode\CLI;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.30.30705\bin\HostX64\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\VCPackages;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\bin\Roslyn;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\\x64;C:\Program Files (x86)\Windows Kits\10\bin\\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\\MSBuild\Current\Bin\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\ActiveTcl\bin;C:\Perl64\site\bin;C:\Perl64\bin;C:\Program Files\Microsoft MPI\Bin\;C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PrivateAssemblies\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\;C:\Users\szekeres\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files\nodejs\;C:\Program Files (x86)\Microsoft Team Foundation Server 2015 Power Tools\;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Microsoft Network Monitor 3\;C:\Program Files\dotnet\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;;C:\Program Files\7-Zip;C:\Program Files (x86)\Certum\proCertum CardManager;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\ManagementStudio\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\TortoiseGit\bin;C:\Program Files\Git\cmd;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files\Azure Data Studio\bin;C:\Program Files (x86)\dotnet\;C:\Users\szekeres\AppData\Roaming\npm;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\AppData\Local\Programs\Fiddler;C:\Users\szekeres\.dotnet\tools;C:\Users\szekeres\.dotnet\tools;;C:\Program Files\Azure Data Studio\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe if not exist src\mapserver-vc17x64 git clone -b main https://github.com/mapserver/mapserver.git src\mapserver-vc17x64 cd src\mapserver-vc17x64 git reset --hard HEAD HEAD is now at f32d18e7c Labeling lines with zero lengths may cause the application to crash (#6493) (#6494) git fetch git checkout main Your branch is behind 'origin/main' by 3 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin main Updating f32d18e7c..a43a21de9 Fast-forward CMakeLists.txt | 8 ++------ appveyor.yml | 13 ++++--------- mapscript/python/CMakeLists.txt | 14 +++++++------- 3 files changed, 13 insertions(+), 22 deletions(-) git reset --hard HEAD HEAD is now at a43a21de9 Merge pull request #6496 from geographika/main git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930-x64\doc\ms_revision.txt type E:\buildsystem\release-1930-x64\doc\ms_revision.txt a43a21de9a1973178f4405f597c765d6a075a014 cd E:\buildsystem if not exist src\gdal-vc17x64 git clone -b master https://github.com/OSGeo/gdal.git src\gdal-vc17x64 cd src\gdal-vc17x64 git reset --hard HEAD HEAD is now at b8b30d7011 ogr2ogr: make detection of FID layer creation option more robust git fetch git checkout master Your branch is behind 'origin/master' by 48 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating b8b30d7011..8d2fab19f6 Fast-forward .github/workflows/android.yml | 4 + .github/workflows/android_cmake.yml | 4 + .github/workflows/asan_build.yml | 4 + .github/workflows/clang_static_analyzer.yml | 3 + .github/workflows/cmake-lint.yml | 11 +- .github/workflows/cmake_builds.yml | 13 +- .github/workflows/code_checks.yml | 4 + .github/workflows/conda.yml | 3 + .github/workflows/doc_build.yml | 4 + .github/workflows/fedora_rawhide.yml | 3 + .github/workflows/macos.yml | 3 + .github/workflows/mingw_w64.yml | 3 + .github/workflows/ubuntu_18.04.yml | 3 + .github/workflows/ubuntu_18.04_32bit.yml | 3 + .github/workflows/ubuntu_20.04.yml | 3 + .github/workflows/validate_xml.yml | 11 +- .github/workflows/windows_build.yml | 3 + alg/CMakeLists.txt | 2 +- alg/gdaltransformer.cpp | 6 + apps/CMakeLists.txt | 2 +- apps/gdalwarp_lib.cpp | 79 +++- apps/test_ogrsf.cpp | 9 +- autotest/alg/applyverticalshiftgrid.py | 6 +- autotest/gcore/data/stored.zip | Bin 0 -> 314 bytes autotest/gcore/tiff_srs.py | 57 +++ autotest/gcore/vsifile.py | 12 + autotest/postinstall/test_c/CMakeLists.txt | 2 +- autotest/postinstall/test_cmake.sh | 1 + cmake/helpers/CheckDependentLibraries.cmake | 79 ++-- cmake/helpers/GdalDriverHelper.cmake | 68 ++- cmake/helpers/GdalGenerateConfig.cmake | 5 +- cmake/modules/{3.16 => 3.20}/FindPostgreSQL.cmake | 38 +- cmake/modules/DefineFindPackage2.cmake | 27 +- cmake/modules/GdalFindModulePath.cmake | 10 + cmake/modules/init.cmake | 35 +- cmake/modules/packages/FindCryptoPP.cmake | 16 +- cmake/modules/packages/FindGEOS.cmake | 7 +- cmake/modules/packages/FindGeoTIFF.cmake | 17 +- cmake/modules/packages/FindJSONC.cmake | 9 +- cmake/modules/packages/FindMySQL.cmake | 4 +- cmake/modules/packages/FindSQLite3.cmake | 11 +- cmake/modules/packages/FindZSTD.cmake | 9 +- cmake/template/GDALConfig.cmake.in | 18 +- doc/source/drivers/vector/osm.rst | 2 +- frmts/arg/CMakeLists.txt | 2 +- frmts/eeda/CMakeLists.txt | 2 +- frmts/gtiff/CMakeLists.txt | 4 +- frmts/gtiff/gt_wkt_srs.cpp | 48 +- frmts/gtiff/libgeotiff/geo_normalize.c | 5 +- frmts/gtiff/libtiff/CMakeLists.txt | 2 +- frmts/gtiff/libtiff/tif_dir.c | 4 +- frmts/gtiff/libtiff/tif_lzw.c | 547 ++++++++++++++-------- frmts/gtiff/libtiff/tiff.h | 2 +- frmts/mbtiles/CMakeLists.txt | 4 +- frmts/mrf/CMakeLists.txt | 2 +- frmts/mrsid/CMakeLists.txt | 2 +- frmts/netcdf/CMakeLists.txt | 9 +- frmts/pds/CMakeLists.txt | 4 +- frmts/plmosaic/CMakeLists.txt | 2 +- frmts/rdb/CMakeLists.txt | 2 +- frmts/vrt/CMakeLists.txt | 2 +- gcore/CMakeLists.txt | 4 +- gdal.cmake | 13 + ogr/CMakeLists.txt | 6 +- ogr/ogrsf_frmts/amigocloud/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/carto/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/cloudant/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/couchdb/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/elastic/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/geojson/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/georss/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/gml/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/gmlas/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/gpx/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/ili/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/jml/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/kml/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/lvbag/CMakeLists.txt | 4 +- ogr/ogrsf_frmts/mvt/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/nas/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/ods/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/osm/CMakeLists.txt | 4 +- ogr/ogrsf_frmts/pds/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/plscenes/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/svg/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/xlsx/CMakeLists.txt | 2 +- port/CMakeLists.txt | 11 +- port/cpl_vsil_curl.cpp | 3 +- port/cpl_vsil_curl_streaming.cpp | 3 +- port/cpl_vsil_gzip.cpp | 3 + 90 files changed, 906 insertions(+), 441 deletions(-) create mode 100644 autotest/gcore/data/stored.zip rename cmake/modules/{3.16 => 3.20}/FindPostgreSQL.cmake (91%) create mode 100644 cmake/modules/GdalFindModulePath.cmake git reset --hard HEAD HEAD is now at 8d2fab19f6 Merge pull request #5472 from rouault/gdal_join_and_quote_no_leading_space git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930-x64\doc\gdal_revision.txt type E:\buildsystem\release-1930-x64\doc\gdal_revision.txt 8d2fab19f69487363d5518019dd6842ce61bda8f cd E:\buildsystem set PATH=E:\buildsystem\release-1930-x64\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\\Extensions\Microsoft\IntelliCode\CLI;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.30.30705\bin\HostX64\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\VCPackages;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\bin\Roslyn;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\\x64;C:\Program Files (x86)\Windows Kits\10\bin\\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\\MSBuild\Current\Bin\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\ActiveTcl\bin;C:\Perl64\site\bin;C:\Perl64\bin;C:\Program Files\Microsoft MPI\Bin\;C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PrivateAssemblies\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\;C:\Users\szekeres\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files\nodejs\;C:\Program Files (x86)\Microsoft Team Foundation Server 2015 Power Tools\;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Microsoft Network Monitor 3\;C:\Program Files\dotnet\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;;C:\Program Files\7-Zip;C:\Program Files (x86)\Certum\proCertum CardManager;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\ManagementStudio\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\TortoiseGit\bin;C:\Program Files\Git\cmd;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files\Azure Data Studio\bin;C:\Program Files (x86)\dotnet\;C:\Users\szekeres\AppData\Roaming\npm;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\AppData\Local\Programs\Fiddler;C:\Users\szekeres\.dotnet\tools;C:\Users\szekeres\.dotnet\tools;;C:\Program Files\Azure Data Studio\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe if not exist src\mapcache-vc17x64 git clone -b main https://github.com/MapServer/mapcache.git src\mapcache-vc17x64 cd src\mapcache-vc17x64 git reset --hard HEAD HEAD is now at 0fc62b1 Prepare for 1.13dev development version (#281) git fetch git checkout main Your branch is up to date with 'origin/main'. git pull origin main Already up to date. git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930-x64\doc\mapcache_revision.txt type E:\buildsystem\release-1930-x64\doc\mapcache_revision.txt 0fc62b15641408834bfc9eab258d0ae311fc436a cd E:\buildsystem