Skip to content

Issue846 doutriaux1 netcdf432 and deps update #972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doutriaux1 merged 3 commits into from
Jan 16, 2015
Merged

Issue846 doutriaux1 netcdf432 and deps update #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e7d2d3
fix #846 - Update netcdf 4.3.0 to 4.3.2 and hdf5 and zlib dependencies
durack1 Nov 23, 2014
7bd1fb7
Merge branch 'issue846_durack1_netcdf432AndDepsUpdate'
doutriaux1 Jan 16, 2015
ead2237
horrible patch step before
doutriaux1 Jan 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMake/cdat_modules/hdf5_external.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ExternalProject_Add(HDF5
URL ${HDF5_URL}/${HDF5_GZ}
URL_MD5 ${HDF5_MD5}
BUILD_IN_SOURCE 1
PATCH_COMMAND ${CMAKE_COMMAND} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/hdf5_patch_step.cmake
#PATCH_COMMAND ${CMAKE_COMMAND} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/hdf5_patch_step.cmake
CONFIGURE_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=-w -DADDITIONAL_CPPFPAGS=-w -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
LOG_BUILD 1
DEPENDS ${HDF5_deps}
Expand Down
5 changes: 2 additions & 3 deletions CMake/cdat_modules/hdf5_pkg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
set(HDF5_MAJOR_SRC 1)
set(HDF5_MINOR_SRC 8)
set(HDF5_PATCH_SRC 8)
set(HDF5_PATCH_SRC 13)
set(HDF5_URL ${LLNL_URL})
set(HDF5_GZ hdf5-${HDF5_MAJOR_SRC}.${HDF5_MINOR_SRC}.${HDF5_PATCH_SRC}.tar.gz)
set(HDF5_MD5 1196e668f5592bfb50d1de162eb16cff)

set(HDF5_MD5 c03426e9e77d7766944654280b467289)

set (nm HDF5)
string(TOUPPER ${nm} uc_nm)
Expand Down
7 changes: 2 additions & 5 deletions CMake/cdat_modules/netcdf_pkg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
set(NC4_MAJOR 4)
set(NC4_MINOR 1)
set(NC4_PATCH 2)
set(NC4_MAJOR_SRC 4)
set(NC4_MINOR_SRC 3)
set(NC4_PATCH_SRC 0.uvcdat.2)
set(NC4_PATCH_SRC 2)
set(NC4_URL ${LLNL_URL})
set(NC4_GZ netcdf-${NC4_MAJOR_SRC}.${NC4_MINOR_SRC}.${NC4_PATCH_SRC}.tar.gz)
set(NC4_MD5 6c5a8c5c32016a2ac4128711e1484805)
set(NC4_MD5 2fd2365e1fe9685368cd6ab0ada532a0)

set (nm NC4)
string(TOUPPER ${nm} uc_nm)
Expand Down
8 changes: 5 additions & 3 deletions CMake/cdat_modules/zlib_pkg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ elseif (ZLIB_PATCH_SRC EQUAL 5)
set(ZLIB_MD5 c735eab2d659a96e5a594c9e8541ad63)
elseif (ZLIB_PATCH_SRC EQUAL 7)
set(ZLIB_MD5 60df6a37c56e7c1366cca812414f7b85)
elseif (ZLIB_PATCH_SRC EQUAL 8)
set(ZLIB_MD5 44d667c142d7cda120332623eab69f40)
else ()
message(FATAL_ERROR "error: invalid zlib patch number: '${ZLIB_PATCH_SRC}' valid: 3, 5 or 7")
message(FATAL_ERROR "error: invalid zlib patch number: '${ZLIB_PATCH_SRC}' valid: 3, 5, 7 or 8")
endif()

set(ZLIB_MAJOR_SRC 1)
set(ZLIB_MINOR_SRC 2)
#ZLIB_PATH_SRC and md5 is configured in CMakeLists.txt because on some RedHAt system we need to change it
#set(ZLIB_PATCH_SRC 3)
#ZLIB_PATH_SRC and md5 is configured in CMakeLists.txt because on some RedHat system we need to change it ; # I don't believe this is true anymore durack1 23 Nov 2014
#set(ZLIB_PATCH_SRC 8)
set(ZLIB_VERSION ${ZLIB_MAJOR_SRC}.${ZLIB_MINOR_SRC}.${ZLIB_PATCH_SRC})
set(ZLIB_URL ${LLNL_URL})
set(ZLIB_GZ zlib-${ZLIB_VERSION}.tar.gz)
Expand Down
⚡