Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[wxWidgets] Use libpng CMake target #16544

Closed
wants to merge 1 commit into from
Closed

[wxWidgets] Use libpng CMake target #16544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ports/wxwidgets/vcpkg-cmake-wrapper.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ foreach(WX_DEBUG_LIB ${WX_DEBUG_LIBS})
endforeach()
_find_package(${ARGS})
find_package(ZLIB QUIET)
find_package(libpng CONFIG QUIET)
find_package(PNG QUIET)
find_package(TIFF QUIET)
find_package(expat CONFIG QUIET)

if(wxWidgets_LIBRARIES AND NOT wxWidgets_LIBRARIES MATCHES "TIFF::TIFF;png;expat::expat;ZLIB::ZLIB")
list(APPEND wxWidgets_LIBRARIES "TIFF::TIFF;png;expat::expat;ZLIB::ZLIB")
if(wxWidgets_LIBRARIES AND NOT wxWidgets_LIBRARIES MATCHES "TIFF::TIFF;PNG::PNG;expat::expat;ZLIB::ZLIB")
list(APPEND wxWidgets_LIBRARIES "TIFF::TIFF;PNG::PNG;expat::expat;ZLIB::ZLIB")
endif()
2 changes: 1 addition & 1 deletion ports/wxwidgets/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "wxwidgets",
"version-semver": "3.1.4",
"port-version": 6,
"port-version": 7,
"description": "a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications.",
"homepage": "https://github.com/wxWidgets/wxWidgets",
"supports": "!uwp",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6278,7 +6278,7 @@
},
"wxwidgets": {
"baseline": "3.1.4",
"port-version": 6
"port-version": 7
},
"x-plane": {
"baseline": "3.0.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/w-/wxwidgets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e0f8707e5cda807515c5d47f1bdc15f71d17589b",
"version-semver": "3.1.4",
"port-version": 7
},
{
"git-tree": "eed8ba1dc939b1c1a17a05bf409142664015ad4d",
"version-semver": "3.1.4",
Expand Down