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

[guetzli] fix mac build #22588

Merged
merged 1 commit into from
Jan 18, 2022
Merged

[guetzli] fix mac build #22588

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
2 changes: 2 additions & 0 deletions ports/guetzli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
13 changes: 6 additions & 7 deletions ports/guetzli/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
10 changes: 7 additions & 3 deletions ports/guetzli/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
]
}
1 change: 0 additions & 1 deletion scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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 @@ -2630,7 +2630,7 @@
},
"guetzli": {
"baseline": "2020-09-14",
"port-version": 1
"port-version": 2
},
"guilite": {
"baseline": "2021-07-31",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/guetzli.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a7da0a5fa0b5bdb568edcbde81b314c3f7089cb0",
"version-date": "2020-09-14",
"port-version": 2
},
{
"git-tree": "2adfb6dcd5eab92b258f45aaf4a494bed18eb687",
"version-string": "2020-09-14",
Expand Down