From c7da369bfdbb595794194f931c85b83f88ffb253 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Thu, 9 Oct 2014 17:11:16 -0500 Subject: [svn-r25690] Update RELEASE.txt for 1.8.14 release: Reviewed and revised version information for unix daily tested machines in supported and tested platforms sections. --- release_docs/RELEASE.txt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 3277ca2..50e41ec 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1172,9 +1172,6 @@ Supported Platforms #1 SMP x86_64 GNU/Linux compilers for 64-bit applications; (koala) Version 4.1.2 20080704 (Red Hat 4.1.2-54) Version 4.8.2 - PGI C, Fortran, C++ for 64-bit target on - x86-64; - Version 13.7-0 Intel(R) C, C++, Fortran Compilers for applications running on Intel(R) 64; Version 14.0.2 (Build 20140120) @@ -1309,12 +1306,12 @@ More Tested Platforms ===================== The following platforms are not supported but have been tested for this release. - Linux 2.6.18-308.13.1.el5PAE MPICH mpich 3.1 compiled with - #1 SMP i686 i686 i386 gcc 4.8.2 and gfortran 4.8.2 + Linux 2.6.18-308.13.1.el5PAE MPICH mpich 3.1.2 compiled with + #1 SMP i686 i686 i386 gcc 4.9.1 and gfortran 4.9.1 (jam) g95 (GCC 4.0.3 (g95 0.94!) - Linux 2.6.18-431.11.2.el6 MPICH mpich 3.1 compiled with - #1 SMP x86_64 GNU/Linux gcc 4.8.2 and gfortran 4.8.2 + Linux 2.6.18-431.11.2.el6 MPICH mpich 3.1.2 compiled with + #1 SMP x86_64 GNU/Linux gcc 4.9.1 and gfortran 4.9.1 (platypus) g95 (GCC 4.0.3 (g95 0.94!) FreeBSD 8.2-STABLE i386 gcc 4.2.1 [FreeBSD] 20070719 -- cgit v0.12 From 6fdac87ac1483c0ef1cbfc29a801f2b0b9c241e2 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Fri, 10 Oct 2014 12:41:13 -0500 Subject: [svn-r25691] File is not generated by non-2003 compliant fortran compilers. Tested: jam and local linux --- fortran/src/CMakeLists.txt | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index a4407e5..c91d9e8 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -38,7 +38,6 @@ else (FORTRAN_HAVE_STORAGE_SIZE) add_executable (H5test_FortranHavekind ${HDF5_F90_SRC_SOURCE_DIR}/H5test_kind.f90 ) - set (H5_TEST_KIND_NAME "h5test_kind_mod") endif (FORTRAN_HAVE_SIZEOF) endif (FORTRAN_HAVE_STORAGE_SIZE) if (WIN32 AND MSVC) @@ -279,7 +278,6 @@ if (WIN32) install ( FILES ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/h5fortran_types.mod - ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/${H5_TEST_KIND_NAME}.mod ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/hdf5.mod ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/h5global.mod ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/h5a.mod @@ -312,11 +310,20 @@ if (WIN32) COMPONENT fortheaders ) + if (H5_TEST_KIND_NAME) + install ( + FILES + ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/${H5_TEST_KIND_NAME}.mod + DESTINATION + ${HDF5_INSTALL_INCLUDE_DIR} + COMPONENT + fortheaders + ) + endif (H5_TEST_KIND_NAME) else (WIN32) install ( FILES ${CMAKE_Fortran_MODULE_DIRECTORY}/h5fortran_types.mod - ${CMAKE_Fortran_MODULE_DIRECTORY}/${H5_TEST_KIND_NAME}.mod ${CMAKE_Fortran_MODULE_DIRECTORY}/hdf5.mod ${CMAKE_Fortran_MODULE_DIRECTORY}/h5global.mod ${CMAKE_Fortran_MODULE_DIRECTORY}/h5f.mod @@ -350,6 +357,16 @@ else (WIN32) COMPONENT fortheaders ) + if (H5_TEST_KIND_NAME) + install ( + FILES + ${CMAKE_Fortran_MODULE_DIRECTORY}/${H5_TEST_KIND_NAME}.mod + DESTINATION + ${HDF5_INSTALL_INCLUDE_DIR} + COMPONENT + fortheaders + ) + endif (H5_TEST_KIND_NAME) endif (WIN32) #----------------------------------------------------------------------------- -- cgit v0.12 From e8ffff6853704824579fbbf053f1819b239802c9 Mon Sep 17 00:00:00 2001 From: HDF Tester Date: Sun, 12 Oct 2014 05:28:29 -0500 Subject: [svn-r25693] Snapshot version 1.9 release 199 --- README.txt | 2 +- c++/src/Makefile.in | 4 +++- config/lt_vers.am | 2 +- configure | 22 +++++++++++----------- configure.ac | 2 +- fortran/src/Makefile.in | 4 +++- hl/c++/src/Makefile.in | 4 +++- hl/fortran/src/Makefile.in | 4 +++- hl/src/Makefile.in | 4 +++- release_docs/RELEASE.txt | 2 +- src/H5public.h | 4 ++-- src/Makefile.in | 4 +++- vms/src/h5pubconf.h | 6 +++--- 13 files changed, 38 insertions(+), 26 deletions(-) diff --git a/README.txt b/README.txt index 4a44e21..dfd5dc3 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -HDF5 version 1.9.199 currently under development +HDF5 version 1.9.200 currently under development Please refer to the release_docs/INSTALL file for installation instructions. ------------------------------------------------------------------------------ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 9652b29..1f0dad7 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -680,8 +680,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. +# After making changes, run bin/reconfigure to update other configure related +# files like Makefile.in. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 189 +LT_VERS_REVISION = 190 LT_VERS_AGE = 0 # This is our main target diff --git a/config/lt_vers.am b/config/lt_vers.am index 868261a..669f4eb 100644 --- a/config/lt_vers.am +++ b/config/lt_vers.am @@ -19,7 +19,7 @@ # After making changes, run bin/reconfigure to update other configure related # files like Makefile.in. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 189 +LT_VERS_REVISION = 190 LT_VERS_AGE = 0 ## If the API changes *at all*, increment LT_VERS_INTERFACE and diff --git a/configure b/configure index 65eb3f6..44547fa 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Id: configure.ac 22697 2012-08-19 14:35:47Z hdftest . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for HDF5 1.9.199. +# Generated by GNU Autoconf 2.69 for HDF5 1.9.200. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='HDF5' PACKAGE_TARNAME='hdf5' -PACKAGE_VERSION='1.9.199' -PACKAGE_STRING='HDF5 1.9.199' +PACKAGE_VERSION='1.9.200' +PACKAGE_STRING='HDF5 1.9.200' PACKAGE_BUGREPORT='help@hdfgroup.org' PACKAGE_URL='' @@ -1489,7 +1489,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures HDF5 1.9.199 to adapt to many kinds of systems. +\`configure' configures HDF5 1.9.200 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1559,7 +1559,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 1.9.199:";; + short | recursive ) echo "Configuration of HDF5 1.9.200:";; esac cat <<\_ACEOF @@ -1752,7 +1752,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HDF5 configure 1.9.199 +HDF5 configure 1.9.200 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2846,7 +2846,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by HDF5 $as_me 1.9.199, which was +It was created by HDF5 $as_me 1.9.200, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3717,7 +3717,7 @@ fi # Define the identity of the package. PACKAGE='hdf5' - VERSION='1.9.199' + VERSION='1.9.200' cat >>confdefs.h <<_ACEOF @@ -31732,7 +31732,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -HDF5 config.lt 1.9.199 +HDF5 config.lt 1.9.200 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -33874,7 +33874,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by HDF5 $as_me 1.9.199, which was +This file was extended by HDF5 $as_me 1.9.200, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -33940,7 +33940,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -HDF5 config.status 1.9.199 +HDF5 config.status 1.9.200 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 60b427f..91c5b29 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_PREREQ([2.69]) ## NOTE: Do not forget to change the version number here when we do a ## release!!! ## -AC_INIT([HDF5], [1.9.199], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.9.200], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/H5.c]) AC_CONFIG_HEADER([src/H5config.h]) diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index f497fe9..615bac7 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -731,8 +731,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. +# After making changes, run bin/reconfigure to update other configure related +# files like Makefile.in. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 189 +LT_VERS_REVISION = 190 LT_VERS_AGE = 0 AM_FCLIBS = $(LIBHDF5) diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index a07bb23..2e56780 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -672,8 +672,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. +# After making changes, run bin/reconfigure to update other configure related +# files like Makefile.in. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 189 +LT_VERS_REVISION = 190 LT_VERS_AGE = 0 # This is our main target diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 362dd63..2085cb5 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -687,8 +687,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. +# After making changes, run bin/reconfigure to update other configure related +# files like Makefile.in. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 189 +LT_VERS_REVISION = 190 LT_VERS_AGE = 0 # Our main target, the high-level fortran library diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 35cdc87..1ced4f8 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -668,8 +668,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. +# After making changes, run bin/reconfigure to update other configure related +# files like Makefile.in. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 189 +LT_VERS_REVISION = 190 LT_VERS_AGE = 0 # This library is our main target. diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 50e41ec..c0a7a3c 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.9.199 currently under development +HDF5 version 1.9.200 currently under development ================================================================================ diff --git a/src/H5public.h b/src/H5public.h index 2ec4d37..cf9d779 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -94,10 +94,10 @@ extern "C" { /* Version numbers */ #define H5_VERS_MAJOR 1 /* For major interface/format changes */ #define H5_VERS_MINOR 9 /* For minor interface/format changes */ -#define H5_VERS_RELEASE 199 /* For tweaks, bug-fixes, or development */ +#define H5_VERS_RELEASE 200 /* For tweaks, bug-fixes, or development */ #define H5_VERS_SUBRELEASE "" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.9.199" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.9.200" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) diff --git a/src/Makefile.in b/src/Makefile.in index 7d61217..c8c1d2c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -730,8 +730,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. +# After making changes, run bin/reconfigure to update other configure related +# files like Makefile.in. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 189 +LT_VERS_REVISION = 190 LT_VERS_AGE = 0 # Our main target, the HDF5 library diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h index 2be7f2d..b13c1c3 100644 --- a/vms/src/h5pubconf.h +++ b/vms/src/h5pubconf.h @@ -501,7 +501,7 @@ #define H5_PACKAGE_NAME "HDF5" /* Define to the full name and version of this package. */ -#define H5_PACKAGE_STRING "HDF5 1.9.199" +#define H5_PACKAGE_STRING "HDF5 1.9.200" /* Define to the one symbol short name of this package. */ #define H5_PACKAGE_TARNAME "hdf5" @@ -510,7 +510,7 @@ #define H5_PACKAGE_URL "" /* Define to the version of this package. */ -#define H5_PACKAGE_VERSION "1.9.199" +#define H5_PACKAGE_VERSION "1.9.200" /* Width for printf() for type `long long' or `__int64', use `ll' */ #define H5_PRINTF_LL_WIDTH "ll" @@ -673,7 +673,7 @@ /* #undef H5_USING_MEMCHECKER */ /* Version number of package */ -#define H5_VERSION "1.9.199" +#define H5_VERSION "1.9.200" /* Define if vsnprintf() returns the correct value for formatted strings that don't fit into size allowed */ -- cgit v0.12 From a65212ed9fdbaee0aa80ce98f29db6888630f965 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Mon, 13 Oct 2014 00:51:00 -0500 Subject: [svn-r25694] HDFFV-8932: added Fortran interface to the default build. Tested: jam, koala, platypus --- bin/cmakehdf5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cmakehdf5 b/bin/cmakehdf5 index d9d0c03..baba3f1 100755 --- a/bin/cmakehdf5 +++ b/bin/cmakehdf5 @@ -30,7 +30,7 @@ exit_code=0 hdf5_src=../hdf5 cacheinit=$hdf5_src/config/cmake/cacheinit.cmake build_cpp_lib=-DHDF5_BUILD_CPP_LIB:BOOL=ON # C++ interface default on -build_fortran= #-DHDF5_BUILD_FORTRAN:BOOL=ON # Fortran interface default off +build_fortran=-DHDF5_BUILD_FORTRAN:BOOL=ON # Fortran interface default on build_hl_lib=-DHDF5_BUILD_HL_LIB:BOOL=ON # High Level interface default on build_testing=-DBUILD_TESTING:BOOL=ON # Build tests default on build_tools=-DHDF5_BUILD_TOOLS:BOOL=ON # Build tools default on -- cgit v0.12 From b40220174575adc12677ab9ab7ea46d533d2a041 Mon Sep 17 00:00:00 2001 From: Elena Pourmal Date: Mon, 13 Oct 2014 07:17:11 -0500 Subject: [svn-r25695] Maintenance: Addressing bug HDFFV-8836 - information in section 3.2 about the SZIP binaries distribution was wrong. Fixed. --- release_docs/INSTALL | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/release_docs/INSTALL b/release_docs/INSTALL index 96f4f6e..2dcb9be 100644 --- a/release_docs/INSTALL +++ b/release_docs/INSTALL @@ -132,27 +132,31 @@ CONTENTS filter will succeed but the data will not be compressed. 3.2. Szip (optional) - The HDF5 Library includes a predefined compression filter that - uses the extended-Rice lossless compression algorithm for chunked - datasets. For more information about Szip compression and license + The HDF5 Library includes a predefined compression filter that + uses the extended-Rice lossless compression algorithm for chunked + datasets. For more information about Szip compression and license terms, see http://hdfgroup.org/doc_resource/SZIP/. - Precompiled Szip binaries for each supported platform and a source - tar file can be found at ftp://ftp.hdfgroup.org/lib-external/szip/. - - To configure the HDF5 Library with the Szip compression filter, use - the '--with-szlib=/PATH_TO_SZIP' flag. For more information, see + The Szip source code can be obtained from the HDF5 Download page + http://www.hdfgroup.org/HDF5/release/obtain5.html#extlibs. Building + instructions are available with the Szip source code. + + The HDF Group does not distribute separate Szip precompiled libraries, + but the HDF5 binaries available from + http://www.hdfgroup.org/HDF5/release/obtain5.html include + the Szip encoder enabled binary for the corresponding platform. + + To configure the HDF5 Library with the Szip compression filter, use + the '--with-szlib=/PATH_TO_SZIP' flag. For more information, see section 4.3.7, "Specifying other libraries and headers." - Starting with release 1.6.3, Szip library binaries are distributed - with the encoder enabled (a license may be required to use this binary) - and with the encoder disabled (freely usable without a license). - If the encoder enabled binary is used, Szip compression encoding is - available for an HDF5 application; if the encoder disabled binary is - used, Szip compression is not available. Szip decoding is always - available for applications (i.e., an HDF5 application can always read - Szip-compressed data) if the Szip filter is present, regardless of the - binary used. + Please notice that if HDF5 configure cannot find a valid Szip library, + configure will not fail; in this case, the compression filter will + not be available to the applications. + + To check if Szip compression was successfully configured in, + check the "I/O filters (external):" line in the configure output, + summary section, printed to the standard output. 3.3. MPI and MPI-IO The parallel version of the library is built upon the foundation -- cgit v0.12 From 6d82d6c7cdb1c1449eb7783b3ecb7b50c0bc7949 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Mon, 13 Oct 2014 22:14:29 -0500 Subject: [svn-r25701] Add LD path to HDF5 install directory to address HDFFV-8944. Tested with h5committest and failed external daily tests. --- configure | 8 ++++++-- configure.ac | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 44547fa..a9120ce 100755 --- a/configure +++ b/configure @@ -4003,7 +4003,11 @@ AM_CFLAGS="${AM_CFLAGS}" AM_CXXFLAGS="${AM_CXXFLAGS}" AM_FCFLAGS="${AM_FCFLAGS}" AM_CPPFLAGS="${AM_CPPFLAGS}" -AM_LDFLAGS="${AM_LDFLAGS}" +if test "x$prefix" = xNONE; then + AM_LDFLAGS="${AM_LDFLAGS} -L$ac_default_prefix/lib" +else + AM_LDFLAGS="$AM_LDFLAGS -L$prefix/lib" +fi CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FCFLAGS="${FCFLAGS}" @@ -26240,7 +26244,7 @@ $as_echo_n "checking for szlib encoder... " >&6; } if test -z "$LD_LIBRARY_PATH"; then export LD_LIBRARY_PATH="$szlib_lib" else - export LD_LIBRARY_PATH="$szlib_lib:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$szlib_lib" fi LL_PATH="$LD_LIBRARY_PATH" diff --git a/configure.ac b/configure.ac index 91c5b29..c17014b 100644 --- a/configure.ac +++ b/configure.ac @@ -115,7 +115,11 @@ AM_CFLAGS="${AM_CFLAGS}" AM_CXXFLAGS="${AM_CXXFLAGS}" AM_FCFLAGS="${AM_FCFLAGS}" AM_CPPFLAGS="${AM_CPPFLAGS}" -AM_LDFLAGS="${AM_LDFLAGS}" +if test "x$prefix" = xNONE; then + AM_LDFLAGS="${AM_LDFLAGS} -L$ac_default_prefix/lib" +else + AM_LDFLAGS="$AM_LDFLAGS -L$prefix/lib" +fi CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FCFLAGS="${FCFLAGS}" @@ -1904,7 +1908,7 @@ if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then if test -z "$LD_LIBRARY_PATH"; then export LD_LIBRARY_PATH="$szlib_lib" else - export LD_LIBRARY_PATH="$szlib_lib:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$szlib_lib" fi AC_SUBST([LL_PATH]) LL_PATH="$LD_LIBRARY_PATH" -- cgit v0.12 From d3dbcf313f1f75644f7232bdfe3c66abade1677f Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Wed, 15 Oct 2014 11:25:05 -0500 Subject: [svn-r25706] Change hdf5 config install location. --- CMakeInstallation.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index beeea60..f82d3b4 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -17,7 +17,7 @@ endif (NOT HDF5_INSTALL_NO_DEVELOPMENT) if (NOT HDF5_EXTERNALLY_CONFIGURED) install ( EXPORT ${HDF5_EXPORTED_TARGETS} - DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE} + DESTINATION ${HDF5_INSTALL_CMAKE_DIR} FILE ${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-targets.cmake COMPONENT configinstall ) @@ -72,7 +72,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED) ) install ( FILES ${HDF5_BINARY_DIR}/CMakeFiles/FindHDF5${HDF_PACKAGE_EXT}.cmake - DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE} + DESTINATION ${HDF5_INSTALL_CMAKE_DIR} COMPONENT configinstall ) endif (NOT HDF5_EXTERNALLY_CONFIGURED) @@ -93,7 +93,7 @@ configure_package_config_file ( if (NOT HDF5_EXTERNALLY_CONFIGURED) install ( FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake - DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE} + DESTINATION ${HDF5_INSTALL_CMAKE_DIR} COMPONENT configinstall ) endif (NOT HDF5_EXTERNALLY_CONFIGURED) @@ -108,7 +108,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED) ) install ( FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake - DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE} + DESTINATION ${HDF5_INSTALL_CMAKE_DIR} COMPONENT configinstall ) endif (NOT HDF5_EXTERNALLY_CONFIGURED) @@ -127,7 +127,7 @@ configure_file ( ) install ( FILES ${HDF5_BINARY_DIR}/libhdf5.settings - DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE} + DESTINATION ${HDF5_INSTALL_CMAKE_DIR} COMPONENT libraries ) -- cgit v0.12 From d527a825d4efa2335f2446f2a118de1f2cf93b76 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Wed, 15 Oct 2014 16:29:29 -0500 Subject: [svn-r25707] Added missing type cast for hid_t_f ids. --- fortran/src/H5Sf.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/fortran/src/H5Sf.c b/fortran/src/H5Sf.c index fe6c298..d738fda 100644 --- a/fortran/src/H5Sf.c +++ b/fortran/src/H5Sf.c @@ -97,7 +97,7 @@ nh5sclose_c ( hid_t_f *space_id ) int ret_value = 0; hid_t c_space_id; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; if ( H5Sclose(c_space_id) < 0 ) ret_value = -1; return ret_value; } @@ -163,7 +163,7 @@ nh5scopy_c( hid_t_f *space_id , hid_t_f *new_space_id) hid_t c_new_space_id; hid_t c_space_id; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; c_new_space_id = H5Scopy(c_space_id); if ( c_new_space_id < 0 ) ret_value = -1; @@ -201,7 +201,7 @@ nh5sget_select_hyper_nblocks_c( hid_t_f *space_id , hssize_t_f * num_blocks) hid_t c_space_id; hssize_t c_num_blocks; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; c_num_blocks = H5Sget_select_hyper_nblocks(c_space_id); if ( c_num_blocks < 0 ) ret_value = -1; @@ -239,7 +239,7 @@ nh5sget_select_elem_npoints_c( hid_t_f *space_id , hssize_t_f * num_points) hid_t c_space_id; hssize_t c_num_points; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; c_num_points = H5Sget_select_elem_npoints(c_space_id); if ( c_num_points < 0 ) ret_value = -1; @@ -278,8 +278,8 @@ nh5sget_select_elem_npoints_c( hid_t_f *space_id , hssize_t_f * num_points) */ int_f -nh5sget_select_hyper_blocklist_c( hid_t_f *space_id ,hsize_t_f * startblock, - hsize_t_f * num_blocks, hsize_t_f * buf) +nh5sget_select_hyper_blocklist_c( hid_t_f *space_id ,hsize_t_f *startblock, + hsize_t_f *num_blocks, hsize_t_f *buf) /******/ { int ret_value = -1; @@ -291,8 +291,8 @@ nh5sget_select_hyper_blocklist_c( hid_t_f *space_id ,hsize_t_f * startblock, int rank; hsize_t c_startblock, *c_buf; - c_space_id = *space_id; - c_num_blocks = * num_blocks; + c_space_id = (hid_t)*space_id; + c_num_blocks = (hsize_t)*num_blocks; rank = H5Sget_simple_extent_ndims(c_space_id); if (rank < 0 ) return ret_value; @@ -360,7 +360,7 @@ nh5sget_select_bounds_c( hid_t_f *space_id , hsize_t_f * start, hsize_t_f * end) int i, rank; int_f ret_value = 0; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; rank = H5Sget_simple_extent_ndims(c_space_id); if(rank < 0 ) HGOTO_DONE(FAIL) @@ -418,7 +418,7 @@ nh5sget_select_elem_pointlist_c( hid_t_f *space_id ,hsize_t_f * startpoint, int rank; int j,i2; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; c_num_points = (hsize_t)* numpoints; rank = H5Sget_simple_extent_ndims(c_space_id); @@ -479,7 +479,7 @@ nh5sselect_all_c ( hid_t_f *space_id ) int ret_value = 0; hid_t c_space_id; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; if ( H5Sselect_all(c_space_id) < 0 ) ret_value = -1; return ret_value; } @@ -508,7 +508,7 @@ nh5sselect_none_c ( hid_t_f *space_id ) int ret_value = 0; hid_t c_space_id; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; if ( H5Sselect_none(c_space_id) < 0 ) ret_value = -1; return ret_value; } @@ -542,7 +542,7 @@ nh5sselect_valid_c ( hid_t_f *space_id , int_f *flag ) hid_t c_space_id; htri_t status; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; status = H5Sselect_valid(c_space_id); *flag = (int_f)status; if ( status < 0 ) ret_value = -1; @@ -577,7 +577,7 @@ nh5sget_simple_extent_npoints_c ( hid_t_f *space_id , hsize_t_f *npoints ) hid_t c_space_id; hssize_t c_npoints; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; c_npoints = H5Sget_simple_extent_npoints(c_space_id); if ( c_npoints == 0 ) ret_value = -1; *npoints = (hsize_t_f)c_npoints; @@ -612,7 +612,7 @@ nh5sget_select_npoints_c ( hid_t_f *space_id , hssize_t_f *npoints ) hssize_t c_npoints; hid_t c_space_id; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; c_npoints = H5Sget_select_npoints(c_space_id); if ( c_npoints < 0 ) ret_value = -1; *npoints = (hssize_t_f)c_npoints; @@ -647,7 +647,7 @@ nh5sget_simple_extent_ndims_c ( hid_t_f *space_id , int_f *ndims ) hid_t c_space_id; int c_ndims; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; c_ndims = H5Sget_simple_extent_ndims(c_space_id); if ( c_ndims < 0 ) ret_value = -1; *ndims = (int_f)c_ndims; @@ -683,7 +683,7 @@ nh5sget_simple_extent_type_c ( hid_t_f *space_id , int_f *classtype) hid_t c_space_id; H5S_class_t c_classtype; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; c_classtype = H5Sget_simple_extent_type(c_space_id); if ( c_classtype < 0 ) ret_value = -1; *classtype = c_classtype; @@ -724,7 +724,7 @@ nh5soffset_simple_c ( hid_t_f *space_id , hssize_t_f *offset) int i; int_f ret_value = 0; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; rank = H5Sget_simple_extent_ndims(c_space_id); if(rank < 0) HGOTO_DONE(FAIL) @@ -820,7 +820,7 @@ nh5sget_simple_extent_dims_c ( hid_t_f *space_id , hsize_t_f *dims, hsize_t_f *m int i; int_f ret_value; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; rank = H5Sget_simple_extent_ndims(c_space_id); if(rank < 0) HGOTO_DONE(FAIL) @@ -871,7 +871,7 @@ nh5sis_simple_c ( hid_t_f *space_id , int_f *flag ) hid_t c_space_id; htri_t status; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; status = H5Sis_simple(c_space_id); *flag = (int_f)status; if ( status < 0 ) ret_value = -1; @@ -905,8 +905,8 @@ nh5sextent_copy_c ( hid_t_f *dest_space_id , hid_t_f *source_space_id) hid_t c_dest_space_id, c_source_space_id; herr_t status; - c_dest_space_id = *dest_space_id; - c_source_space_id = *source_space_id; + c_dest_space_id = (hid_t)*dest_space_id; + c_source_space_id = (hid_t)*source_space_id; status = H5Sextent_copy(c_dest_space_id, c_source_space_id); if ( status < 0 ) ret_value = -1; return ret_value; @@ -937,7 +937,7 @@ nh5sset_extent_none_c ( hid_t_f *space_id ) hid_t c_space_id; herr_t status; - c_space_id = *space_id; + c_space_id = (hid_t)*space_id; status = H5Sset_extent_none(c_space_id); if ( status < 0 ) ret_value = -1; return ret_value; -- cgit v0.12