[wxwidgets] make wxUSE_STL an optional triplet feature (#19274)

wxUSE_STL defaults to OFF so that is how it is in Linux
distribution packages. Downstream projects developed with
wxUSE_STL=ON are not necessarily compatible with wxUSE_STL=OFF
without modification. So, by default, go with wxWidgets' default
for compatibility with downstream codebases. vcpkg users who need
wxUSE_STL=ON can still do so by simply opting into the new 'stl'
feature of this port.

https://forums.wxwidgets.org/viewtopic.php?p=165208
Signed-off-by: Be <be@mixxx.org>
This commit is contained in:
Be 2021-08-19 08:59:43 -07:00 committed by GitHub
parent bd7fc2c75b
commit 996baeff29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 4 deletions

View File

@ -23,6 +23,13 @@ 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.
if(NOT DEFINED WXWIDGETS_USE_STL)
set(WXWIDGETS_USE_STL OFF)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
@ -33,8 +40,8 @@ vcpkg_configure_cmake(
-DwxUSE_LIBJPEG=sys
-DwxUSE_LIBPNG=sys
-DwxUSE_LIBTIFF=sys
-DwxUSE_STL=ON
-DwxBUILD_DISABLE_PLATFORM_LIB_DIR=ON
-DwxUSE_STL=${WXWIDGETS_USE_STL}
${OPTIONS}
)

View File

@ -1,8 +1,11 @@
{
"name": "wxwidgets",
"version-semver": "3.1.5",
"port-version": 2,
"description": "a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications.",
"port-version": 3,
"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."
],
"homepage": "https://github.com/wxWidgets/wxWidgets",
"supports": "!uwp",
"dependencies": [

View File

@ -6782,7 +6782,7 @@
},
"wxwidgets": {
"baseline": "3.1.5",
"port-version": 2
"port-version": 3
},
"x-plane": {
"baseline": "3.0.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "dcd0a52fd041f8c7b658a01ec1141f36d77220c6",
"version-semver": "3.1.5",
"port-version": 3
},
{
"git-tree": "6fa230bffdee1e7d700570c31e6f08367460c0c9",
"version-semver": "3.1.5",