diff options
| author | Martin Storsjö <martin@martin.st> | 2022-10-12 10:30:29 +0300 |
|---|---|---|
| committer | Cosmin Truta <ctruta@gmail.com> | 2022-10-12 12:35:33 +0300 |
| commit | e56f79c0c6d94f5d727fc147d4487038e188cdf2 (patch) | |
| tree | d37e185dbd7ff8461f2a464714037e6ff65df39a | |
| parent | 12222e6fbdc90523be77633ed430144cfee22772 (diff) | |
| download | libpng-e56f79c0c6d94f5d727fc147d4487038e188cdf2.tar.gz | |
cmake: Default to PNG_ARM_NEON=off for arm targets
This matches the configure script - unless the user has requested
anything, no hardware optimizations are autoenabled.
Defaulting to "check" is brittle (that configuration is deprecated
and poorly supported) - and for configurations where it would
make sense (where NEON isn't universally enabled in the compiler)
it didn't end up setting ARM_NEON_OPT to 1 in pnglibconf.h anyway.
This fixes default builds with cmake for iOS and Windows on armv7,
where NEON is universally available (but there's no runtime check
implemented) - but actually using NEON on this architecture
requires explicitly opting in to it when configuring, just like
with the configure script.
Signed-off-by: Cosmin Truta <ctruta@gmail.com>
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4662a50a7..b4637f997 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,7 @@ # Revised by Owen Rudge, 2020 # Revised by Gleb Mazovetskiy, 2021 # Revised by Christopher Sean Morrison, 2022 +# Revised by Martin Storsjo, 2022 # This code is released under the libpng license. # For conditions of distribution and use, see the disclaimer @@ -98,8 +99,8 @@ if(TARGET_ARCH MATCHES "^arm" OR CACHE STRING "Enable ARM NEON optimizations: on|off; on is default") else() set(PNG_ARM_NEON_POSSIBLE_VALUES check on off) - set(PNG_ARM_NEON "check" - CACHE STRING "Enable ARM NEON optimizations: check|on|off; check is default") + set(PNG_ARM_NEON "off" + CACHE STRING "Enable ARM NEON optimizations: check|on|off; off is default") endif() set_property(CACHE PNG_ARM_NEON PROPERTY STRINGS ${PNG_ARM_NEON_POSSIBLE_VALUES}) |