diff options
| author | Be <be@mixxx.org> | 2021-08-19 08:59:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-19 08:59:43 -0700 |
| commit | 996baeff2978d1e80b8939ef1688c2aa6f276dbd (patch) | |
| tree | 7c0575b53c53e405ca94963ac75c76d20046e12b | |
| parent | bd7fc2c75b87b815c96abff1990a0d2333b20d6d (diff) | |
| download | vcpkg-996baeff2978d1e80b8939ef1688c2aa6f276dbd.tar.gz vcpkg-996baeff2978d1e80b8939ef1688c2aa6f276dbd.zip | |
[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>
| -rw-r--r-- | ports/wxwidgets/portfile.cmake | 9 | ||||
| -rw-r--r-- | ports/wxwidgets/vcpkg.json | 7 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/w-/wxwidgets.json | 5 |
4 files changed, 19 insertions, 4 deletions
diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 8b2050e2d..5b5ecd730 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -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} ) diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index c7464fe14..540e2147f 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -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": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1bfc674bc..739bdd009 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6782,7 +6782,7 @@ }, "wxwidgets": { "baseline": "3.1.5", - "port-version": 2 + "port-version": 3 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index 72eaf1357..d674192ce 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "dcd0a52fd041f8c7b658a01ec1141f36d77220c6", + "version-semver": "3.1.5", + "port-version": 3 + }, + { "git-tree": "6fa230bffdee1e7d700570c31e6f08367460c0c9", "version-semver": "3.1.5", "port-version": 2 |