Skip to content
Snippets Groups Projects
Commit 8454f141 authored by Attila Krasznahorkay's avatar Attila Krasznahorkay
Browse files

Merge branch 'cherry-pick-13709ffd' into '1.0.48-patches'

Cherry-pick "Merge branch 'SimageCentOS7Fix-1.0-20200228' into '1.0'" into 1.0.48-patches

See merge request atlas/atlasexternals!732
parents 5099a8fa 68e9a796
No related branches found
No related tags found
No related merge requests found
# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
# CMake configuration file describing the build and installation of the
# Coin3D-simage library.
......@@ -23,10 +23,11 @@ ExternalProject_Add( Simage
CONFIGURE_COMMAND ./configure --prefix=${_buildDir}
INSTALL_DIR ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}
BUILD_IN_SOURCE 1
PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/patches/libpng_centos7.patch
INSTALL_COMMAND make install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${_buildDir}/ <INSTALL_DIR> )
ExternalProject_Add_Step( Simage forcedownload
COMMAND ${CMAKE_COMMAND} -E echo "Forcing the re-download of Simage"
COMMAND ${CMAKE_COMMAND} -E echo "Forcing the re-download of Simage "
DEPENDERS download )
add_dependencies( Package_Simage Simage )
......
diff -ur Simage-original/src/simage_png.c Simage/src/simage_png.c
--- Simage-original/src/simage_png.c 2017-06-15 18:36:38.000000001 +0200
+++ Simage/src/simage_png.c 2017-06-15 18:39:13.000000001 +0200
@@ -342,7 +342,7 @@
/* Set error handling. REQUIRED if you aren't supplying your own
* error hadnling functions in the png_create_write_struct() call.
*/
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
/* If we get here, we had a problem reading the file */
fclose(fp);
png_destroy_write_struct(&png_ptr, (png_infopp)info_ptr);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment