diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-07 11:23:59 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-04-07 11:24:14 -0700 |
| commit | cf93d45879a1c19973d60aefe69d7da8fd5f0212 (patch) | |
| tree | 595de1109dfb7b9b1dc36f5f0d4202fafae5b173 | |
| parent | 2e7896e89e7f0cb15b30b7d087f8001c57b3220a (diff) | |
| download | vcpkg-cf93d45879a1c19973d60aefe69d7da8fd5f0212.tar.gz vcpkg-cf93d45879a1c19973d60aefe69d7da8fd5f0212.zip | |
[libpng] Fix x86-uwp builds
| -rw-r--r-- | ports/libpng/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libpng/dont-double-eval-CMAKE_SYSTEM_PROCESSOR.patch | 15 | ||||
| -rw-r--r-- | ports/libpng/portfile.cmake | 4 |
3 files changed, 19 insertions, 2 deletions
diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL index 2d111607e..801a9f1fb 100644 --- a/ports/libpng/CONTROL +++ b/ports/libpng/CONTROL @@ -1,4 +1,4 @@ Source: libpng -Version: 1.6.28 +Version: 1.6.28-1 Build-Depends: zlib Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files. diff --git a/ports/libpng/dont-double-eval-CMAKE_SYSTEM_PROCESSOR.patch b/ports/libpng/dont-double-eval-CMAKE_SYSTEM_PROCESSOR.patch new file mode 100644 index 000000000..3af02186f --- /dev/null +++ b/ports/libpng/dont-double-eval-CMAKE_SYSTEM_PROCESSOR.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e076d5e..428cf68 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -78,8 +78,8 @@ set(PNG_PREFIX "" CACHE STRING "Prefix to add to the API function names") + set(DFA_XTRA "" CACHE FILEPATH "File containing extra configuration settings") + + # set definitions and sources for arm +-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm" OR +- ${CMAKE_SYSTEM_PROCESSOR} MATCHES "^aarch64") ++if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" OR ++ CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") + set(PNG_ARM_NEON_POSSIBLE_VALUES check on off) + set(PNG_ARM_NEON "check" CACHE STRING "Enable ARM NEON optimizations: + check: (default) use internal checking code; diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index 759601e51..7c9c8194a 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -9,7 +9,9 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch" + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch + ${CMAKE_CURRENT_LIST_DIR}/dont-double-eval-CMAKE_SYSTEM_PROCESSOR.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) |