Merge pull request #15373 from pmur:libpng-vsx-fix

6bf6d1dc · Alexander Alekhin · 56e832ee · 8aca1934 · 6bf6d1dc
Commit 6bf6d1dc authored Aug 22, 2019 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

CMakeLists.txt 3rdparty/libpng/CMakeLists.txt +3 -1

No files found.
--- a/3rdparty/libpng/CMakeLists.txt
+++ b/3rdparty/libpng/CMakeLists.txt
@@ -47,7 +47,9 @@ if(";${CPU_BASELINE_FINAL};" MATCHES "SSE2"
 endif()

 if(PPC64LE OR PPC64)
-  if(ENABLE_VSX AND NOT PPC64)
+  # VSX3 features are backwards compatible
+  if(";${CPU_BASELINE_FINAL};" MATCHES "VSX.*"
+      AND NOT PPC64)
    list(APPEND lib_srcs powerpc/powerpc_init.c powerpc/filter_vsx_intrinsics.c)
    add_definitions(-DPNG_POWERPC_VSX_OPT=2)
  else()