Commit a0211593 authored by Jeremy Cohen's avatar Jeremy Cohen Committed by Chris Cantwell
Browse files

Update third party zlib to 1.2.9 to fix build issue with meshgen

parent aae964bc
......@@ -199,7 +199,7 @@ IF (THIRDPARTY_BUILD_BOOST)
# If building ThirdParty zlib, force zlib build before boost
IF (THIRDPARTY_BUILD_ZLIB)
ADD_DEPENDENCIES(boost zlib-1.2.7)
ADD_DEPENDENCIES(boost zlib-1.2.9)
ENDIF(THIRDPARTY_BUILD_ZLIB)
# Set up CMake variables
......
......@@ -21,26 +21,26 @@ OPTION(THIRDPARTY_BUILD_ZLIB "Build ZLib library" ${BUILD_ZLIB})
IF (THIRDPARTY_BUILD_ZLIB)
INCLUDE(ExternalProject)
EXTERNALPROJECT_ADD(
zlib-1.2.7
URL ${TPURL}/zlib-1.2.7.tar.gz
URL_MD5 "4a162e0f643232e7e278d59a0603ceb0"
zlib-1.2.9
URL ${TPURL}/zlib-1.2.9.tar.gz
URL_MD5 "e453644539a07783aa525e834491134e"
STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPSRC}/zlib-1.2.7
BINARY_DIR ${TPBUILD}/zlib-1.2.7
TMP_DIR ${TPBUILD}/zlib-1.2.7-tmp
SOURCE_DIR ${TPSRC}/zlib-1.2.9
BINARY_DIR ${TPBUILD}/zlib-1.2.9
TMP_DIR ${TPBUILD}/zlib-1.2.9-tmp
INSTALL_DIR ${TPDIST}
CONFIGURE_COMMAND ${CMAKE_COMMAND}
-G ${CMAKE_GENERATOR}
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-DCMAKE_INSTALL_PREFIX:PATH=${TPDIST}
-DCMAKE_C_FLAGS:STRING=-fPIC
${TPSRC}/zlib-1.2.7
${TPSRC}/zlib-1.2.9
)
IF (APPLE)
EXTERNALPROJECT_ADD_STEP(zlib-1.2.7 patch-install-path
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -id ${CMAKE_INSTALL_PREFIX}/${NEKTAR_LIB_DIR}/libz.1.2.7.dylib ${TPDIST}/lib/libz.1.2.7.dylib
EXTERNALPROJECT_ADD_STEP(zlib-1.2.9 patch-install-path
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -id ${CMAKE_INSTALL_PREFIX}/${NEKTAR_LIB_DIR}/libz.1.2.9.dylib ${TPDIST}/lib/libz.1.2.9.dylib
DEPENDEES install)
ENDIF ()
......@@ -58,7 +58,7 @@ IF (THIRDPARTY_BUILD_ZLIB)
SET(ZLIB_INCLUDE_DIR ${TPDIST}/include CACHE PATH "Zlib include" FORCE)
SET(ZLIB_CONFIG_INCLUDE_DIR ${TPINC})
ELSE (THIRDPARTY_BUILD_ZLIB)
ADD_CUSTOM_TARGET(zlib-1.2.7 ALL)
ADD_CUSTOM_TARGET(zlib-1.2.9 ALL)
MESSAGE(STATUS "Found Zlib: ${ZLIB_LIBRARIES} (version ${ZLIB_VERSION_STRING})")
# We use the found library also for debug builds.
......
......@@ -348,7 +348,7 @@ HEADERS ${LibUtilityHeaders}
SUMMARY "Nektar++ LibUtilities library"
DESCRIPTION "This library provides core routines including linear algebra and integration with ThirdParty libraries.")
ADD_DEPENDENCIES(LibUtilities boost tinyxml-2.6.2 zlib-1.2.7)
ADD_DEPENDENCIES(LibUtilities boost tinyxml-2.6.2 zlib-1.2.9)
### Libraries needed specifically by LibUtilities ###
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment