diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-04-30 20:20:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-30 11:20:31 -0700 |
| commit | 369e139bf3e5e1d05b9b1e83d0f3dc1796d53383 (patch) | |
| tree | ef573d57489157f7fc87dae910fd0f469f30aff7 | |
| parent | b7678882b73b3ec90329fae58fc724102ffa9cac (diff) | |
| download | vcpkg-369e139bf3e5e1d05b9b1e83d0f3dc1796d53383.tar.gz vcpkg-369e139bf3e5e1d05b9b1e83d0f3dc1796d53383.zip | |
[libwebp] Fix release-only builds (#17172)
* Fix release-only builds of libwebp
* Bump port version
* Update versions
| -rw-r--r-- | ports/libwebp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libwebp/portfile.cmake | 10 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libwebp.json | 5 |
4 files changed, 13 insertions, 6 deletions
diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL index eea81b46c..2d9b2fd7d 100644 --- a/ports/libwebp/CONTROL +++ b/ports/libwebp/CONTROL @@ -1,6 +1,6 @@ Source: libwebp Version: 1.1.0 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/webmproject/libwebp Description: WebP codec: library to encode and decode images in WebP format Default-Features: simd, nearlossless diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index 4318c34d4..97673b7e4 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -61,10 +61,12 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH share/WebP/cmake TARGET_PATH share/WebP) # find_package is called with WebP not libwebp file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebp.pc" "-lwebp" "-lwebpd") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebpdecoder.pc" "-lwebpdecoder" "-lwebpdecoderd") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebpdemux.pc" "-lwebpdemux" "-lwebpdemuxd") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebpmux.pc" "-lwebpmux" "-lwebpmuxd") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebp.pc" "-lwebp" "-lwebpd") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebpdecoder.pc" "-lwebpdecoder" "-lwebpdecoderd") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebpdemux.pc" "-lwebpdemux" "-lwebpdemuxd") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebpmux.pc" "-lwebpmux" "-lwebpmuxd") +endif() vcpkg_fixup_pkgconfig() diff --git a/versions/baseline.json b/versions/baseline.json index 64d044e46..36efdcb3a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3630,7 +3630,7 @@ }, "libwebp": { "baseline": "1.1.0", - "port-version": 2 + "port-version": 3 }, "libwebsockets": { "baseline": "4.1.6", diff --git a/versions/l-/libwebp.json b/versions/l-/libwebp.json index 1ecc51c0d..66eb510e5 100644 --- a/versions/l-/libwebp.json +++ b/versions/l-/libwebp.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "7a3bfc774b61126901f0f9524de41ef864918f35", + "version-string": "1.1.0", + "port-version": 3 + }, + { "git-tree": "8e1a0ef8ea8d864f10f3ad1604f3d0e920534ecd", "version-string": "1.1.0", "port-version": 2 |