diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 5b5ecd730724d9..4a49d7f1ad0798 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wxWidgets/wxWidgets @@ -24,15 +22,18 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 OR VCPKG_TARGET_ARCHITECTURE STREQUA endif() # This may be set to ON by users in a custom triplet. -# wxUSE_STL=ON and wxUSE_STL=OFF are not API compatible which is why this must be set -# in a custom triplet rather than a port feature. +# The use of 'wxUSE_STL' and 'WXWIDGETS_USE_STD_CONTAINERS' (ON or OFF) are not API compatible +# which is why they must be set in a custom triplet rather than a port feature. if(NOT DEFINED WXWIDGETS_USE_STL) set(WXWIDGETS_USE_STL OFF) endif() -vcpkg_configure_cmake( +if(NOT DEFINED WXWIDGETS_USE_STD_CONTAINERS) + set(WXWIDGETS_USE_STD_CONTAINERS OFF) +endif() + +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DwxUSE_REGEX=builtin -DwxUSE_ZLIB=sys @@ -42,10 +43,11 @@ vcpkg_configure_cmake( -DwxUSE_LIBTIFF=sys -DwxBUILD_DISABLE_PLATFORM_LIB_DIR=ON -DwxUSE_STL=${WXWIDGETS_USE_STL} + -DwxUSE_STD_CONTAINERS=${WXWIDGETS_USE_STD_CONTAINERS} ${OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") if(DLLS) diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 540e2147fc7923..70967100ad7442 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,10 +1,11 @@ { "name": "wxwidgets", "version-semver": "3.1.5", - "port-version": 3, + "port-version": 4, "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." + "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", + "Set WXWIDGETS_USE_STD_CONTAINERS in a custom triplet to build with the wxUSE_STD_CONTAINERS build option." ], "homepage": "https://github.com/wxWidgets/wxWidgets", "supports": "!uwp", @@ -12,6 +13,14 @@ "expat", "libpng", "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 9624e7957b08db..ccb7e69f5ec578 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7278,7 +7278,7 @@ }, "wxwidgets": { "baseline": "3.1.5", - "port-version": 3 + "port-version": 4 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index d674192ce108db..84db306ee64ba0 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c485515f9004da8092ce9ed1ea3e319fa66a7f77", + "version-semver": "3.1.5", + "port-version": 4 + }, { "git-tree": "dcd0a52fd041f8c7b658a01ec1141f36d77220c6", "version-semver": "3.1.5",