Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ports/wxwidgets/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
)

Expand Down
7 changes: 5 additions & 2 deletions ports/wxwidgets/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -6738,7 +6738,7 @@
},
"wxwidgets": {
"baseline": "3.1.5",
"port-version": 2
"port-version": 3
},
"x-plane": {
"baseline": "3.0.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/w-/wxwidgets.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "dcd0a52fd041f8c7b658a01ec1141f36d77220c6",
"version-semver": "3.1.5",
"port-version": 3
},
{
"git-tree": "6fa230bffdee1e7d700570c31e6f08367460c0c9",
"version-semver": "3.1.5",
Expand Down