next

.github/workflows/mac.yml

@@ -1,36 +1,30 @@
 name: Build macOS
 
-on:
-  push:
-    paths:
-      - 'vcpkg-test/**'
-      - 'vcpkg-overlay/**'
-      - '.github/workflows/mac.yml'
-
-  release:
-    types:
-      - published
+on: [push]
 
 concurrency:
   group: ci-${{github.ref}}-mac
   cancel-in-progress: true
-  
+
 jobs:
   mac_os_build:
     runs-on: macos-12
     if: github.repository == 'merginmaps/input-sdk'
+
     env:
-      QT_VERSION: 6.5.2
+      QT_VERSION: '6.5.2'
       ARCH: 'x64'
-      CACHE_VERSION: 0
+      TRIPLET: "x64-osx"
+      CMAKE_GENERATOR: "Ninja"
       MACOSX_DEPLOYMENT_TARGET: 10.15.0
       XC_VERSION: ${{ '14.2' }}
+      QT_ARCH: "desktop"
+      VCPKG_ROOT: "/Users/runner/vcpkg"
       VCPKG_BASELINE: "d765306b074717dea8dc1c4723e1b025acb61c2d" # use scripts/update_vcpkg_base.bash to change
-
+      CACHE_VERSION: 0
+
     steps:
       - uses: actions/checkout@v3
-        with:
-          path: 'input-sdk'
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:

.github/workflows/win.yml

@@ -1,25 +1,16 @@
 name: Build win64
 
-on:
-  push:
-    paths:
-      - 'vcpkg-test/**'
-      - 'vcpkg-overlay/**'
-      - '.github/workflows/win.yml'
-
-  release:
-    types:
-      - published
+on: [push]
 
 concurrency:
   group: ci-${{github.ref}}-windows
   cancel-in-progress: true
-  
+
 jobs:
   win64_build:
     if: ( github.repository == 'MerginMaps/input-sdk' )
     runs-on: windows-2019
-    
+
     env:
       QT_VERSION: '6.5.2'
       ARCH: "win64"

CMakeLists.txt

@@ -105,10 +105,7 @@ target_link_libraries(merginmapsinputsdk PRIVATE libzip::zip)
 target_link_libraries(merginmapsinputsdk PRIVATE libzip::zip)
 target_link_libraries(merginmapsinputsdk PRIVATE protobuf::libprotobuf-lite)
 target_link_libraries(merginmapsinputsdk PRIVATE qca) 
-target_link_libraries(merginmapsinputsdk PRIVATE exiv2lib) 
-if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-  target_link_libraries(merginmapsinputsdk PRIVATE exiv2-xmp)
-endif()
+target_link_libraries(merginmapsinputsdk PRIVATE exiv2lib exiv2-xmp)
 target_link_libraries(merginmapsinputsdk PRIVATE PostgreSQL::PostgreSQL)
 target_link_libraries(merginmapsinputsdk PRIVATE Qt6Keychain::Qt6Keychain)
 target_link_libraries(merginmapsinputsdk PRIVATE CURL::libcurl)

README.md

@@ -27,6 +27,7 @@ The release is automatically created from each build on master.
 - how to do diff `diff -rupN file.orig file`
 - how to do diff from GIT `git diff master`
 - find SHA512 hash for vcpkg: `shasum -a 512 myfile.tar.gz`
+- vcpkg clean build - remove `vcpkg/buildtrees/`
 
 ## Android 
 

vcpkg-overlay/ports/gdal/portfile.cmake

@@ -9,63 +9,65 @@ vcpkg_from_github(
         fix-gdal-target-interfaces.patch
         libkml.patch
 )
+
 # `vcpkg clean` stumbles over one subdir
 file(REMOVE_RECURSE "${SOURCE_PATH}/autotest")
 
-# Cf. cmake/helpers/CheckDependentLibraries.cmake
-# The default for all `GDAL_USE_<PKG>` dependencies is `OFF`.
-# Here, we explicitly control dependencies provided via vpcpkg.
-# "core" is used for a dependency which must be enabled to avoid vendored lib.
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        cfitsio          GDAL_USE_CFITSIO
-        curl             GDAL_USE_CURL
-        expat            GDAL_USE_EXPAT
-        freexl           GDAL_USE_FREEXL
-        geos             GDAL_USE_GEOS
-        core             GDAL_USE_GEOTIFF
-        gif              GDAL_USE_GIF
-        hdf5             GDAL_USE_HDF5
-        iconv            GDAL_USE_ICONV
-        jpeg             GDAL_USE_JPEG
-        core             GDAL_USE_JSONC
-        lerc             GDAL_USE_LERC
-        libkml           GDAL_USE_LIBKML
-        lzma             GDAL_USE_LIBLZMA
-        libxml2          GDAL_USE_LIBXML2
-        mysql-libmariadb GDAL_USE_MYSQL 
-        netcdf           GDAL_USE_NETCDF
-        odbc             GDAL_USE_ODBC
-        openjpeg         GDAL_USE_OPENJPEG
-        openssl          GDAL_USE_OPENSSL
-        pcre2            GDAL_USE_PCRE2
-        png              GDAL_USE_PNG
-        poppler          GDAL_USE_POPPLER
-        postgresql       GDAL_USE_POSTGRESQL
-        qhull            GDAL_USE_QHULL
-        #core             GDAL_USE_SHAPELIB  # https://github.com/OSGeo/gdal/issues/5711, https://github.com/microsoft/vcpkg/issues/16041
-        core             GDAL_USE_SHAPELIB_INTERNAL
-        libspatialite    GDAL_USE_SPATIALITE
-        sqlite3          GDAL_USE_SQLITE3
-        core             GDAL_USE_TIFF
-        webp             GDAL_USE_WEBP
-        core             GDAL_USE_ZLIB
-        zstd             GDAL_USE_ZSTD
-        tools            BUILD_APPS
-)
+# cannot use internal because we need it to WebP too
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_JPEG=ON)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_JPEG_INTERNAL=ON)
+
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_PNG=ON)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_PNG_INTERNAL=ON)
+
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_JSONC=ON)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_JSONC_INTERNAL=ON)
+
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_GEOTIFF=ON)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_GEOTIFF_INTERNAL=ON)
+
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_ICONV=ON)
 if(GDAL_USE_ICONV AND VCPKG_TARGET_IS_WINDOWS)
     list(APPEND FEATURE_OPTIONS -D_ICONV_SECOND_ARGUMENT_IS_NOT_CONST=ON)
 endif()
 
-if(VCPKG_TARGET_IS_IOS AND GDAL_USE_JPEG)
-    list(APPEND FEATURE_OPTIONS -DGDAL_USE_JPEG_INTERNAL=ON)
-endif()
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_TIFF=ON)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_CURL=ON)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_WEBP=ON)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_SQLITE3=ON)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_GEOS=ON)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_GEOTIFF=ON)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_SPATIALITE=ON)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_EXPAT=ON)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_ZLIB=ON)
+
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_POSTGRESQL=OFF)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_PCRE2=OFF)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_ZSTD=OFF)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_LIBXML2=OFF)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_GIF=OFF)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_OPENJPEG=OFF)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_ODBC=OFF)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_CFITSIO=OFF)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_HDF5=OFF)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_MYSQL=OFF)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_POPPLER=OFF)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_ODBC=OFF)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_MSSQL_ODBC=OFF)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_FREEXL=OFF)
 
 # Compatibility with older Android versions https://github.com/OSGeo/gdal/pull/5941
 if(VCPKG_TARGET_IS_ANDROID AND ANRDOID_PLATFORM VERSION_LESS 24 AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm"))
     list(APPEND FEATURE_OPTIONS -DBUILD_WITHOUT_64BIT_OFFSET=ON)
 endif()
 
+
+if()
+    BUILD_APPS=OFF
+else()
+    BUILD_APPS=OFF
+endif()
+
 string(REPLACE "dynamic" "" qhull_target "Qhull::qhull${VCPKG_LIBRARY_LINKAGE}_r")
 
 vcpkg_cmake_configure(
@@ -98,6 +100,7 @@ vcpkg_cmake_configure(
     MAYBE_UNUSED_VARIABLES
         QHULL_LIBRARY
 )
+
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
@@ -114,34 +117,7 @@ if (BUILD_APPS)
     vcpkg_copy_tools(
         TOOL_NAMES
             gdalinfo
-            gdalbuildvrt
-            gdaladdo
-            gdal_grid
-            gdal_translate
-            gdal_rasterize
-            gdalsrsinfo
-            gdalenhance
-            gdalmanage
-            gdaltransform
-            gdaltindex
-            gdaldem
-            gdal_create
-            gdal_viewshed
-            nearblack
-            ogrlineref
-            ogrtindex
-            gdalwarp
-            gdal_contour
-            gdallocationinfo
             ogrinfo
-            ogr2ogr
-            ogrlineref
-            nearblack
-            gdalmdiminfo
-            gdalmdimtranslate
-            gnmanalyse
-            gnmmanage
-            sozip
         AUTO_CLEAN
     )
 endif()