[expat] Update the version to 2.2.9 (add support for uwp) (#9146)

* [expat] Update the version to 2.2.9(support uwp)

* [readosm] Fix expat.lib cannot be found

* Remove expat:arm-uwp and expat:x64-uwp from fail list in ci.baseline.txt

* [apr-util,io2d,skia] Fix expat cannot be found and also update expat

* [many ports] Add supports and fix the regressions

* Fix new regressions

* Fix typo

* [io2d] Update expat patch

* [io2d,libkml,skia] Fix expat cannot find and also fix typo

* [expat] Remove usage

* [libkml,vtk] Update expat patch and fix static build

* [wxwidgets] Fix static build caused by expat cannot found

* Update as review suggestion

* Add Port-Version

* Remove evpp:x64-osx=fail from ci.baseline.txt

* [wxwidgest] Remove unnecessary spaces

* [itk] Fix expat cannot be found

* fix cmake test port

* [wxwidgets] Update Port-Version

Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>

2 files changed, 8 insertions, 5 deletions

diff --git a/ports/spatialite-tools/CONTROL b/ports/spatialite-tools/CONTROL
index 73a698dee..7d6bf5496 100644
--- a/ports/spatialite-tools/CONTROL
+++ b/ports/spatialite-tools/CONTROL
@@ -1,5 +1,6 @@
 Source: spatialite-tools
-Version: 4.3.0-2
+Version: 4.3.0
+Port-Version: 3
 Homepage: https://www.gaia-gis.it/fossil/spatialite-tools/index
 Description: Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries)
 Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat
diff --git a/ports/spatialite-tools/portfile.cmake b/ports/spatialite-tools/portfile.cmake
index 7a731fd3f..a035198af 100644
--- a/ports/spatialite-tools/portfile.cmake
+++ b/ports/spatialite-tools/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 option(BUILD_DEBUG_TOOLS "Build debug version of tools" OFF)
 
 vcpkg_download_distfile(ARCHIVE
@@ -30,6 +28,8 @@ if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
     set(SPATIALITE_LIBS_DBG "${LDIR}/debug/lib/spatialite.lib")
     set(ICONV_LIBS_REL "${LDIR}/lib/libiconv.lib")
     set(ICONV_LIBS_DBG "${LDIR}/debug/lib/libiconv.lib")
+    set(EXPAT_LIBS_REL "${LDIR}/lib/libexpat.lib")
+    set(EXPAT_LIBS_DBG "${LDIR}/debug/lib/libexpatd.lib")  
 else()
     set(CL_FLAGS_DBG "/MTd /Zi /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H")
     set(CL_FLAGS_REL "/MT /Ox /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H")
@@ -41,6 +41,8 @@ else()
     set(SPATIALITE_LIBS_DBG "${LDIR}/debug/lib/spatialite.lib ${LDIR}/debug/lib/freexl.lib")
     set(ICONV_LIBS_REL "${LDIR}/lib/libiconv.lib ${LDIR}/lib/libcharset.lib")
     set(ICONV_LIBS_DBG "${LDIR}/debug/lib/libiconv.lib ${LDIR}/debug/lib/libcharset.lib ")
+    set(EXPAT_LIBS_REL "${LDIR}/lib/libexpatMD.lib")
+    set(EXPAT_LIBS_DBG "${LDIR}/debug/lib/libexpatdMD.lib") 
 endif()
 
 set(LIBS_ALL_DBG
@@ -49,8 +51,8 @@ set(LIBS_ALL_DBG
     ${SPATIALITE_LIBS_DBG} \
     ${LIBXML2_LIBS_DBG} \
     ${GEOS_LIBS_DBG} \
+    ${EXPAT_LIBS_DBG} \
     ${LDIR}/debug/lib/readosm.lib \
-    ${LDIR}/debug/lib/expat.lib \
     ${LDIR}/debug/lib/zlibd.lib \
     ${LDIR}/debug/lib/proj_d.lib"
    )
@@ -60,8 +62,8 @@ set(LIBS_ALL_REL
     ${SPATIALITE_LIBS_REL} \
     ${LIBXML2_LIBS_REL} \
     ${GEOS_LIBS_REL} \
+    ${EXPAT_LIBS_REL} \
     ${LDIR}/lib/readosm.lib \
-    ${LDIR}/lib/expat.lib \
     ${LDIR}/lib/zlib.lib \
     ${LDIR}/lib/proj.lib"
    )