From dd8aa3e939b349db46db3a24969987b508d5bc3c Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 31 Dec 2016 13:03:23 -0600 Subject: [PATCH] [libpng16] Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna) --- ANNOUNCE | 5 +++-- CHANGES | 3 ++- CMakeLists.txt | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 1aa841436..d82dd7127 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.28beta01 - December 30, 2016 +Libpng 1.6.28beta01 - December 31, 2016 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -25,7 +25,8 @@ Other information: Changes since the last public release (1.6.27): -Version 1.6.28beta01 [December 30, 2016] +Version 1.6.28beta01 [December 31, 2016] + Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index b114af4d0..c9cdbccd6 100644 --- a/CHANGES +++ b/CHANGES @@ -5774,7 +5774,8 @@ Version 1.6.27 [December 29, 2016] Fixed a potential null pointer dereference in png_set_text_2() (bug report and patch by Patrick Keshishian, CVE-2016-10087). -Version 1.6.28beta01 [December 30, 2016] +Version 1.6.28beta01 [December 31, 2016] + Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index b49ed36ad..e5d429e9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,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") +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;