Fix target_link_libraries on repeated inclusion of wrappers (#19120)

* Fix repeated inclusion of wrappers

* x-add-version

7 files changed, 36 insertions, 6 deletions

diff --git a/versions/baseline.json b/versions/baseline.json
index e333a3c34..3240c7631 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1926,7 +1926,7 @@
     },
     "exiv2": {
       "baseline": "0.27.4",
-      "port-version": 1
+      "port-version": 2
     },
     "expat": {
       "baseline": "2.4.1",
@@ -2238,7 +2238,7 @@
     },
     "gdal": {
       "baseline": "3.2.2",
-      "port-version": 3
+      "port-version": 4
     },
     "gdcm": {
       "baseline": "3.0.7",
@@ -3086,7 +3086,7 @@
     },
     "libarchive": {
       "baseline": "3.4.3",
-      "port-version": 7
+      "port-version": 8
     },
     "libass": {
       "baseline": "0.15.1",
@@ -3306,7 +3306,7 @@
     },
     "libiconv": {
       "baseline": "1.16",
-      "port-version": 10
+      "port-version": 11
     },
     "libics": {
       "baseline": "1.6.5",
@@ -3766,7 +3766,7 @@
     },
     "libuv": {
       "baseline": "1.41.0",
-      "port-version": 0
+      "port-version": 1
     },
     "libuvc": {
       "baseline": "2020-11-24",
@@ -3810,7 +3810,7 @@
     },
     "libxml2": {
       "baseline": "2.9.12",
-      "port-version": 3
+      "port-version": 4
     },
     "libxmlmm": {
       "baseline": "0.6.0",
diff --git a/versions/e-/exiv2.json b/versions/e-/exiv2.json
index 5673a816d..b98e6e654 100644
--- a/versions/e-/exiv2.json
+++ b/versions/e-/exiv2.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "4ce7841080b34ab8f91006430e9a40e0d9bfba96",
+      "version": "0.27.4",
+      "port-version": 2
+    },
+    {
       "git-tree": "1e93f266421999dd82b931b2dbf672d255b14b43",
       "version": "0.27.4",
       "port-version": 1
diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json
index d6da35027..762f3061e 100644
--- a/versions/g-/gdal.json
+++ b/versions/g-/gdal.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "b87df6a4a70bb9afb31992195a8ccc6e04d59663",
+      "version-semver": "3.2.2",
+      "port-version": 4
+    },
+    {
       "git-tree": "5bb72450f69322e39e09bea191e5c947833e698d",
       "version-semver": "3.2.2",
       "port-version": 3
diff --git a/versions/l-/libarchive.json b/versions/l-/libarchive.json
index 97dcae3bd..689a49eec 100644
--- a/versions/l-/libarchive.json
+++ b/versions/l-/libarchive.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "576d8d60f06c8b4c616fd55559f3da94b9a8ae27",
+      "version-semver": "3.4.3",
+      "port-version": 8
+    },
+    {
       "git-tree": "3c9f2bae07e5615f25bfc8326b1b85686953e918",
       "version-semver": "3.4.3",
       "port-version": 7
diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json
index 63631614f..9423b2719 100644
--- a/versions/l-/libiconv.json
+++ b/versions/l-/libiconv.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "f82980bff6c23bcccd043300679ebf8afa3e0a22",
+      "version": "1.16",
+      "port-version": 11
+    },
+    {
       "git-tree": "59948ca7f6b4427c2ea93be7a1558843cdd8cde3",
       "version-string": "1.16",
       "port-version": 10
diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json
index 673b06bea..011e4609c 100644
--- a/versions/l-/libuv.json
+++ b/versions/l-/libuv.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "42fa2a97059c54e5c2374a9762a7060d85a1091b",
+      "version": "1.41.0",
+      "port-version": 1
+    },
+    {
       "git-tree": "25ef9957bffba1e73f3dd857f8dc27148ec6f84f",
       "version-string": "1.41.0",
       "port-version": 0
diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json
index 455ba9477..5645cd564 100644
--- a/versions/l-/libxml2.json
+++ b/versions/l-/libxml2.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "5cb8ed61786fdd081204880cd02d9376b17130eb",
+      "version-semver": "2.9.12",
+      "port-version": 4
+    },
+    {
       "git-tree": "091644d055f6ab14ab96001c90418be9f5c4d6e3",
       "version-semver": "2.9.12",
       "port-version": 3