Skip to content
Snippets Groups Projects
Commit bcb5abca authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'png-disable-opt' into release


375afed5 Merge branch 'upstream-png' into png-disable-opt
747aa4bd png-release 2019-03-20 (b422a024)
ae72ec15 png: update to disable architecture optimizations

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !5327
parents 274bd96d 375afed5
Branches
No related tags found
No related merge requests found
......@@ -8,7 +8,7 @@ readonly name="png"
readonly ownership="Libpng Upstream <kwrobot@kitware.com>"
readonly subtree="ThirdParty/$name/vtk$name"
readonly repo="https://gitlab.kitware.com/third-party/png.git"
readonly tag="for/vtk-old"
readonly tag="for/vtk-old-20190320-1.6.29"
readonly paths="
.gitattributes
CMakeLists.vtk.txt
......
......@@ -31,6 +31,11 @@ if (WIN32)
endif ()
endif ()
add_definitions(-DPNG_ARM_NEON_OPT=0)
add_definitions(-DPNG_MIPS_MSA_OPT=0)
add_definitions(-DPNG_POWERPC_VSX_OPT=0)
add_definitions(-DPNG_INTEL_SSE_OPT=0)
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/vtkpngConfig.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/vtkpngConfig.h")
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment