[wxWidgets] Fix issue introduced in 9b654a1 (#22509)

AenBleidd · web-flow · commit 371be89c1e3b · 2022-01-14T16:01:13.000-08:00
Signed-off-by: Vitalii Koshura &lt;lestat.de.lionkur@gmail.com&gt;
diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake
@@ -102,13 +102,15 @@ if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/wx/setup.h)
 
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
         vcpkg_replace_string("${WX_SETUP_H_FILES_REL}" "${CURRENT_PACKAGES_DIR}" "")
-        vcpkg_replace_string("${WX_SETUP_H_FILES_REL}" "${CURRENT_PACKAGES_DIR}/lib/" "")
-        vcpkg_replace_string("${WX_SETUP_H_FILES_REL}" "/setup.h" "")
+
+        string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/" "" WX_SETUP_H_FILES_REL "${WX_SETUP_H_FILES_REL}")
+        string(REPLACE "/setup.h" "" WX_SETUP_H_REL_RELATIVE "${WX_SETUP_H_FILES_REL}")
     endif()
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
         vcpkg_replace_string("${WX_SETUP_H_FILES_DBG}" "${CURRENT_PACKAGES_DIR}" "")
-        vcpkg_replace_string("${WX_SETUP_H_FILES_DBG}" "${CURRENT_PACKAGES_DIR}/debug/lib/" "")
-        vcpkg_replace_string("${WX_SETUP_H_FILES_DBG}" "/setup.h" "")
+
+        string(REPLACE "${CURRENT_PACKAGES_DIR}/debug/lib/" "" WX_SETUP_H_FILES_DBG "${WX_SETUP_H_FILES_DBG}")
+        string(REPLACE "/setup.h" "" WX_SETUP_H_DBG_RELATIVE "${WX_SETUP_H_FILES_DBG}")
     endif()
 
     configure_file(${CMAKE_CURRENT_LIST_DIR}/setup.h.in ${CURRENT_PACKAGES_DIR}/include/wx/setup.h @ONLY)
diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "wxwidgets",
   "version-semver": "3.1.5",
-  "port-version": 6,
+  "port-version": 7,
   "description": [
     "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ",
     "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.",
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7342,7 +7342,7 @@
     },
     "wxwidgets": {
       "baseline": "3.1.5",
-      "port-version": 6
+      "port-version": 7
     },
     "x-plane": {
       "baseline": "3.0.3",
diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9184caa631070403a5fd8c177b56907a313ad197",
+      "version-semver": "3.1.5",
+      "port-version": 7
+    },
     {
       "git-tree": "79ef97e2255a360a5515d0fbdbb839c15bb12548",
       "version-semver": "3.1.5",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "wxwidgets",`
`3`	`3`	`"version-semver": "3.1.5",`
`4`		`- "port-version": 6,`
	`4`	`+ "port-version": 7,`
`5`	`5`	`"description": [`
`6`	`6`	`"Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ",`
`7`	`7`	`"Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"versions": [`
	`3`	`+ {`
	`4`	`+ "git-tree": "9184caa631070403a5fd8c177b56907a313ad197",`
	`5`	`+ "version-semver": "3.1.5",`
	`6`	`+ "port-version": 7`
	`7`	`+ },`
`3`	`8`	`{`
`4`	`9`	`"git-tree": "79ef97e2255a360a5515d0fbdbb839c15bb12548",`
`5`	`10`	`"version-semver": "3.1.5",`