diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-04-20 08:11:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-19 17:11:01 -0700 |
| commit | 3e9fce266bcdecfea1c1a3d14420a2c82f687991 (patch) | |
| tree | 0f1c3a6a0f0b68369c3cb657fc8b5251e80ecc2d | |
| parent | 9c5b3024bb33de21069821916402d031d29d3bf8 (diff) | |
| download | vcpkg-3e9fce266bcdecfea1c1a3d14420a2c82f687991.tar.gz vcpkg-3e9fce266bcdecfea1c1a3d14420a2c82f687991.zip | |
[wxwidgets] Fix cmake wrapper (#16546)
* [wxwidgets] Fix cmake wrapper
* update version record
* Update versions/w-/wxwidgets.json
* Update ports/wxwidgets/vcpkg-cmake-wrapper.cmake
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* Update versions/w-/wxwidgets.json
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
| -rw-r--r-- | ports/wxwidgets/vcpkg-cmake-wrapper.cmake | 8 | ||||
| -rw-r--r-- | ports/wxwidgets/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/w-/wxwidgets.json | 5 |
4 files changed, 14 insertions, 3 deletions
diff --git a/ports/wxwidgets/vcpkg-cmake-wrapper.cmake b/ports/wxwidgets/vcpkg-cmake-wrapper.cmake index f2eb1bcc2..55557b360 100644 --- a/ports/wxwidgets/vcpkg-cmake-wrapper.cmake +++ b/ports/wxwidgets/vcpkg-cmake-wrapper.cmake @@ -15,5 +15,11 @@ 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")
+ list(APPEND wxWidgets_LIBRARIES "TIFF::TIFF;expat::expat;ZLIB::ZLIB")
+
+ if (TARGET png)
+ list(APPEND wxWidgets_LIBRARIES "png")
+ elseif(TARGET png_static)
+ list(APPEND wxWidgets_LIBRARIES "png_static")
+ endif()
endif()
diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 1823f252c..f419affbd 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wxwidgets", "version-semver": "3.1.4", - "port-version": 7, + "port-version": 8, "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", diff --git a/versions/baseline.json b/versions/baseline.json index f7766e91f..1861c3eed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6446,7 +6446,7 @@ }, "wxwidgets": { "baseline": "3.1.4", - "port-version": 7 + "port-version": 8 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index c0f45d844..93b4d8d60 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "8fc2d91de4a0a86698c67e6bb662c14cbfd29732", + "version-semver": "3.1.4", + "port-version": 8 + }, + { "git-tree": "12acbc593b35e2d327b6fc665c8eed6e25745431", "version-semver": "3.1.4", "port-version": 7 |