mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 13:03:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[libwebp] Fixed build error ARM64 Windows 10 (#9300)

Browse Source 
* [libwebp] Fixed build error ARM64 Windows 10

* [libwebp] Fixed cmake error ARM and ARM64
This commit is contained in:
Tatsuro Shibamura 2019-12-24 08:19:51 +09:00 committed by dan-shaw
parent ff6d107460
commit 13c4d0c18d
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/libwebp/0007-fix-arm-build.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake
index da9a42a4..ce7a69f3 100644
--- a/cmake/cpu.cmake
+++ b/cmake/cpu.cmake
@@ -73,7 +73,7 @@ foreach(I_SIMD RANGE ${WEBP_SIMD_FLAGS_RANGE})
set(CMAKE_REQUIRED_FLAGS ${SIMD_COMPILE_FLAG})
webp_check_compiler_flag(${WEBP_SIMD_FLAG} ${WEBP_ENABLE_SIMD})
else()
- if(MSVC)
+ if(MSVC AND NOT (CMAKE_GENERATOR_PLATFORM MATCHES "^ARM"))
list(GET SIMD_ENABLE_FLAGS ${I_SIMD} SIMD_COMPILE_FLAG)
else()
set(SIMD_COMPILE_FLAG " ")

5
ports/libwebp/CONTROL
View File

@ -1,9 +1,8 @@
Source: libwebp
Version: 1.0.2-7
Version: 1.0.2-8
Homepage: https://github.com/webmproject/libwebp
Description: Lossy compression of digital photographic images.
Build-Depends: opengl
Feature: all
Description: enable all webp features
Build-Depends: giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut (!osx), sdl1 (windows)
Build-Depends: giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut (!osx), sdl1 (windows), opengl

1
ports/libwebp/portfile.cmake
View File

@ -13,6 +13,7 @@ vcpkg_from_github(
0004-add-missing-linked-library.patch
0005-fix-static-build.patch
0006-fix-dependecies-platform.patch
0007-fix-arm-build.patch
)
set(WEBP_BUILD_ANIM_UTILS OFF)