[guetzli] fix mac build (#22588)

This commit is contained in:
autoantwort 2022-01-18 22:07:13 +01:00 committed by GitHub
parent 15f50770ea
commit 6bb5aa3b97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 12 deletions

View File

@ -17,6 +17,8 @@ list(REMOVE_ITEM guetzli_srcs "guetzli/guetzli.cc")
add_library(guetzli_lib ${guetzli_srcs})
target_compile_features(guetzli_lib PUBLIC cxx_std_11)
add_executable(guetzli guetzli/guetzli.cc)
target_link_libraries(guetzli_lib ${butteraugli_library} ${PNG_LIBRARIES})

View File

@ -9,17 +9,16 @@ vcpkg_from_github(
PATCHES butteraugli.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/guetzli)
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/guetzli")
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/guetzli RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/guetzli" RENAME copyright)

View File

@ -1,11 +1,15 @@
{
"name": "guetzli",
"version-string": "2020-09-14",
"port-version": 1,
"version-date": "2020-09-14",
"port-version": 2,
"description": "Perceptual JPEG encoder",
"homepage": "https://github.com/google/guetzli",
"dependencies": [
"butteraugli",
"libpng"
"libpng",
{
"name": "vcpkg-cmake",
"host": true
}
]
}

View File

@ -408,7 +408,6 @@ gstreamer:x64-osx=fail
gtk:x64-windows-static=fail
gtk:x64-windows-static-md=fail
gts:x64-osx=fail
guetzli:x64-osx=fail
halide:x64-windows-static=fail
hdf5:arm64-windows=fail
hdf5:arm-uwp=fail

View File

@ -2626,7 +2626,7 @@
},
"guetzli": {
"baseline": "2020-09-14",
"port-version": 1
"port-version": 2
},
"guilite": {
"baseline": "2021-07-31",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a7da0a5fa0b5bdb568edcbde81b314c3f7089cb0",
"version-date": "2020-09-14",
"port-version": 2
},
{
"git-tree": "2adfb6dcd5eab92b258f45aaf4a494bed18eb687",
"version-string": "2020-09-14",