diff options
Diffstat (limited to 'hl')
-rw-r--r-- | hl/CMakeLists.txt | 4 | ||||
-rwxr-xr-x | hl/Makefile.in | 3 | ||||
-rw-r--r-- | hl/c++/Makefile.in | 3 | ||||
-rw-r--r-- | hl/c++/examples/CMakeLists.txt | 42 | ||||
-rw-r--r-- | hl/c++/examples/Makefile.in | 3 | ||||
-rw-r--r-- | hl/c++/src/Makefile.in | 5 | ||||
-rw-r--r-- | hl/c++/test/CMakeLists.txt | 3 | ||||
-rw-r--r-- | hl/c++/test/Makefile.in | 3 | ||||
-rw-r--r-- | hl/examples/CMakeLists.txt | 37 | ||||
-rw-r--r-- | hl/examples/Makefile.in | 3 | ||||
-rw-r--r-- | hl/fortran/CMakeLists.txt | 22 | ||||
-rw-r--r-- | hl/fortran/Makefile.in | 3 | ||||
-rw-r--r-- | hl/fortran/examples/CMakeLists.txt | 15 | ||||
-rw-r--r-- | hl/fortran/examples/Makefile.in | 3 | ||||
-rw-r--r-- | hl/fortran/src/CMakeLists.txt | 58 | ||||
-rwxr-xr-x | hl/fortran/src/H5LTf90proto.h | 192 | ||||
-rw-r--r-- | hl/fortran/src/Makefile.in | 5 | ||||
-rw-r--r-- | hl/fortran/test/CMakeLists.txt | 18 | ||||
-rw-r--r-- | hl/fortran/test/Makefile.in | 3 | ||||
-rw-r--r-- | hl/src/H5DS.c | 266 | ||||
-rw-r--r-- | hl/src/Makefile.in | 5 | ||||
-rw-r--r-- | hl/test/CMakeLists.txt | 6 | ||||
-rw-r--r-- | hl/test/Makefile.in | 3 | ||||
-rw-r--r-- | hl/tools/CMakeLists.txt | 9 | ||||
-rw-r--r-- | hl/tools/Makefile.in | 3 | ||||
-rw-r--r-- | hl/tools/gif2h5/Makefile.in | 3 |
26 files changed, 342 insertions, 378 deletions
diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt index 2871734..0c0ad91 100644 --- a/hl/CMakeLists.txt +++ b/hl/CMakeLists.txt @@ -1,11 +1,13 @@ cmake_minimum_required (VERSION 2.8) -PROJECT (HDF5_HL) +PROJECT (HDF5_HL C CXX) #----------------------------------------------------------------------------- # Shared Libs #----------------------------------------------------------------------------- IF (BUILD_SHARED_LIBS) SET (HL_BUILT_AS_DYNAMIC_LIB 1) +ELSE (BUILD_SHARED_LIBS) + SET (HL_BUILT_AS_STATIC_LIB 1) ENDIF (BUILD_SHARED_LIBS) #----------------------------------------------------------------------------- diff --git a/hl/Makefile.in b/hl/Makefile.in index f599f5c..9924bc9 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -157,6 +157,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@ DIRECT_VFD = @DIRECT_VFD@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ @@ -218,6 +219,7 @@ LTLIBOBJS = @LTLIBOBJS@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ @@ -274,6 +276,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index f0a1d05..2ff76ec 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -153,6 +153,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@ DIRECT_VFD = @DIRECT_VFD@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ @@ -214,6 +215,7 @@ LTLIBOBJS = @LTLIBOBJS@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ @@ -270,6 +272,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt index 23b0db3..9b86027 100644 --- a/hl/c++/examples/CMakeLists.txt +++ b/hl/c++/examples/CMakeLists.txt @@ -10,29 +10,25 @@ INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SRC_DIR}/src) # -------------------------------------------------------------------- # Add in the examples for the Packet Table codes # -------------------------------------------------------------------- -IF (HDF5_BUILD_EXAMPLES) - ADD_EXECUTABLE (ptExampleFL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleFL.cpp) - H5_NAMING (ptExampleFL) - TARGET_WIN_PROPERTIES (ptExampleFL) - TARGET_LINK_LIBRARIES ( - ptExampleFL - ${HDF5_HL_CPP_LIB_TARGET} - ${HDF5_HL_LIB_TARGET} - ${HDF5_LIB_TARGET} - ) +ADD_EXECUTABLE (ptExampleFL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleFL.cpp) +H5_NAMING (ptExampleFL ${LIB_TYPE}) +TARGET_LINK_LIBRARIES ( + ptExampleFL + ${HDF5_HL_CPP_LIB_TARGET} + ${HDF5_HL_LIB_TARGET} + ${HDF5_LIB_TARGET} +) - ADD_TEST (NAME cpp_hl_ex_ptExampleFL COMMAND $<TARGET_FILE:ptExampleFL>) - - ADD_EXECUTABLE (ptExampleVL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleVL.cpp) - H5_NAMING (ptExampleVL) - TARGET_WIN_PROPERTIES (ptExampleVL) - TARGET_LINK_LIBRARIES ( - ptExampleVL - ${HDF5_HL_CPP_LIB_TARGET} - ${HDF5_HL_LIB_TARGET} - ${HDF5_LIB_TARGET} - ) +ADD_EXECUTABLE (ptExampleVL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleVL.cpp) +H5_NAMING (ptExampleVL ${LIB_TYPE}) +TARGET_LINK_LIBRARIES ( + ptExampleVL + ${HDF5_HL_CPP_LIB_TARGET} + ${HDF5_HL_LIB_TARGET} + ${HDF5_LIB_TARGET} +) +IF (BUILD_TESTING) + ADD_TEST (NAME cpp_hl_ex_ptExampleFL COMMAND $<TARGET_FILE:ptExampleFL>) ADD_TEST (NAME cpp_hl_ex_ptExampleVL COMMAND $<TARGET_FILE:ptExampleVL>) - -ENDIF (HDF5_BUILD_EXAMPLES) +ENDIF (BUILD_TESTING) diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index b7d628b..009b7d2 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -119,6 +119,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@ DIRECT_VFD = @DIRECT_VFD@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ @@ -180,6 +181,7 @@ LTLIBOBJS = @LTLIBOBJS@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ @@ -236,6 +238,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index fe323fb..5e31fcf 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -165,6 +165,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@ DIRECT_VFD = @DIRECT_VFD@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ @@ -226,6 +227,7 @@ LTLIBOBJS = @LTLIBOBJS@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ @@ -282,6 +284,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -392,7 +395,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 69 +LT_VERS_REVISION = 70 LT_VERS_AGE = 0 # Include src directory diff --git a/hl/c++/test/CMakeLists.txt b/hl/c++/test/CMakeLists.txt index cf621a2..c7fb793 100644 --- a/hl/c++/test/CMakeLists.txt +++ b/hl/c++/test/CMakeLists.txt @@ -17,8 +17,7 @@ IF (BUILD_TESTING) INCLUDE_DIRECTORIES (${HDF5_CPP_SRC_DIR}/src) ADD_EXECUTABLE (hl_ptableTest ${HDF5_HL_CPP_TEST_SOURCE_DIR}/ptableTest.cpp) - H5_NAMING (hl_ptableTest) - TARGET_WIN_PROPERTIES (hl_ptableTest) + H5_NAMING (hl_ptableTest ${LIB_TYPE}) TARGET_LINK_LIBRARIES ( hl_ptableTest ${HDF5_LIB_TARGET} diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 3128fe8..29a7ab1 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -139,6 +139,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@ DIRECT_VFD = @DIRECT_VFD@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ @@ -200,6 +201,7 @@ LTLIBOBJS = @LTLIBOBJS@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ @@ -256,6 +258,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ diff --git a/hl/examples/CMakeLists.txt b/hl/examples/CMakeLists.txt index 227f066..298ce94 100644 --- a/hl/examples/CMakeLists.txt +++ b/hl/examples/CMakeLists.txt @@ -1,6 +1,20 @@ cmake_minimum_required (VERSION 2.8) PROJECT (HDF5_HL_EXAMPLES ) +SET (HDF5_TEST_FILES +) + +FOREACH (h5_file ${HDF5_TEST_FILES}) + SET (dest "${PROJECT_BINARY_DIR}/${h5_file}") + #MESSAGE (STATUS " Copying ${h5_file}") + ADD_CUSTOM_COMMAND ( + TARGET h5dump + POST_BUILD + COMMAND ${CMAKE_COMMAND} + ARGS -E copy_if_different ${PROJECT_SOURCE_DIR}/${h5_file} ${dest} + ) +ENDFOREACH (h5_file ${HDF5_TEST_FILES}) + #----------------------------------------------------------------------------- # Define Sources #----------------------------------------------------------------------------- @@ -29,9 +43,28 @@ SET (examples FOREACH (example ${examples}) ADD_EXECUTABLE (hl_ex_${example} ${HDF5_HL_EXAMPLES_SOURCE_DIR}/${example}.c) - H5_NAMING (hl_ex_${example}) - TARGET_WIN_PROPERTIES (hl_ex_${example}) + H5_NAMING (hl_ex_${example} ${LIB_TYPE}) TARGET_LINK_LIBRARIES (hl_ex_${example} ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET}) + + IF (BUILD_TESTING) + ADD_TEST (NAME hl_ex_${example} COMMAND $<TARGET_FILE:hl_ex_${example}>) + ENDIF (BUILD_TESTING) ENDFOREACH (example ${examples}) +IF (BUILD_TESTING) + SET (HDF5_TEST_FILES + image24pixel.txt + image8.txt + ) + FOREACH (h5_file ${HDF5_TEST_FILES}) + SET (dest "${PROJECT_BINARY_DIR}/${h5_file}") + #MESSAGE (STATUS " Copying ${h5_file}") + ADD_CUSTOM_COMMAND ( + TARGET hl_ex_ex_ds1 + POST_BUILD + COMMAND ${CMAKE_COMMAND} + ARGS -E copy_if_different ${PROJECT_SOURCE_DIR}/${h5_file} ${dest} + ) + ENDFOREACH (h5_file ${HDF5_TEST_FILES}) +ENDIF (BUILD_TESTING) diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index c3fa914..b7bd414 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -119,6 +119,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@ DIRECT_VFD = @DIRECT_VFD@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ @@ -180,6 +181,7 @@ LTLIBOBJS = @LTLIBOBJS@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ @@ -236,6 +238,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ diff --git a/hl/fortran/CMakeLists.txt b/hl/fortran/CMakeLists.txt index 4c2256c..1fd6de0 100644 --- a/hl/fortran/CMakeLists.txt +++ b/hl/fortran/CMakeLists.txt @@ -1,25 +1,5 @@ cmake_minimum_required (VERSION 2.8) -PROJECT(HDF5_HL_F90 C CXX Fortran) - -#----------------------------------------------------------------------------- -# Setup include Directories -#----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES (${HDF5_F90_SRC_DIR}/src) -INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR}) -INCLUDE_DIRECTORIES (${HDF5_F90_SRC_BINARY_DIR}) -INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY}) - -LINK_DIRECTORIES (${HDF5_SRC_DIR} ${HDF5_F90_SRC_DIR}/src ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) - -#----------------------------------------------------------------------------- -# Add debug information (intel Fortran : JB) -#----------------------------------------------------------------------------- -IF (CMAKE_Fortran_COMPILER MATCHES ifort) - IF (WIN32) - SET (CMAKE_Fortran_FLAGS_DEBUG "/debug:full /dbglibs " CACHE "flags" STRING FORCE) - SET (CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG" CACHE "flags" STRING FORCE) - ENDIF (WIN32) -ENDIF (CMAKE_Fortran_COMPILER MATCHES ifort) +PROJECT (HDF5_HL_F90 C CXX Fortran) #----------------------------------------------------------------------------- # List Source files diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index cbf948b..4ea48ae 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -157,6 +157,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@ DIRECT_VFD = @DIRECT_VFD@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ @@ -218,6 +219,7 @@ LTLIBOBJS = @LTLIBOBJS@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ @@ -274,6 +276,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ diff --git a/hl/fortran/examples/CMakeLists.txt b/hl/fortran/examples/CMakeLists.txt index 5e20da3..2f56297 100644 --- a/hl/fortran/examples/CMakeLists.txt +++ b/hl/fortran/examples/CMakeLists.txt @@ -4,12 +4,10 @@ PROJECT (HDF5_HL_F90_EXAMPLES C CXX Fortran) #----------------------------------------------------------------------------- # Setup include Directories #----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src) -LINK_DIRECTORIES ( +INCLUDE_DIRECTORIES ( ${CMAKE_Fortran_MODULE_DIRECTORY} - ${HDF5_HL_F90_BINARY_DIR} ${HDF5_F90_BINARY_DIR} - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} + ${HDF5_F90_SRC_DIR}/src ) SET (examples @@ -18,12 +16,17 @@ SET (examples FOREACH (example ${examples}) ADD_EXECUTABLE (hl_f90_ex_${example} ${HDF5_HL_F90_EXAMPLES_SOURCE_DIR}/${example}.f90) - H5_NAMING (hl_f90_ex_${example}) - TARGET_FORTRAN_WIN_PROPERTIES (hl_f90_ex_${example}) + H5_NAMING (hl_f90_ex_${example} ${LIB_TYPE}) + TARGET_FORTRAN_WIN_PROPERTIES (hl_f90_ex_${example} "") TARGET_LINK_LIBRARIES (hl_f90_ex_${example} ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET} ) SET_TARGET_PROPERTIES (hl_f90_ex_${example} PROPERTIES LINKER_LANGUAGE Fortran) + + IF (BUILD_TESTING) + ADD_TEST (NAME hl_f90_ex_${example} COMMAND $<TARGET_FILE:hl_f90_ex_${example}>) + ENDIF (BUILD_TESTING) + ENDFOREACH (example ${examples}) diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index 62e02c5..9b11c56 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -120,6 +120,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@ DIRECT_VFD = @DIRECT_VFD@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ @@ -181,6 +182,7 @@ LTLIBOBJS = @LTLIBOBJS@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ @@ -237,6 +239,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index 421fdff..e55fcd4 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -5,52 +5,42 @@ PROJECT(HDF5_HL_F90_SRC C CXX Fortran) # Setup include Directories #----------------------------------------------------------------------------- INCLUDE_DIRECTORIES ( - ${CMAKE_Fortran_MODULE_DIRECTORY} - ${HDF5_F90_BINARY_DIR} - ${HDF5_F90_SRC_DIR}/src - ${HDF5_F90_SRC_BINARY_DIR} - ${HDF5_HL_F90_SRC_SOURCE_DIR} ${HDF5_HL_SRC_DIR}/src -) -LINK_DIRECTORIES ( - ${CMAKE_Fortran_MODULE_DIRECTORY} - ${HDF5_HL_F90_BINARY_DIR} + ${HDF5_F90_SRC_DIR}/src ${HDF5_F90_BINARY_DIR} - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} + ${CMAKE_Fortran_MODULE_DIRECTORY} ) + #----------------------------------------------------------------------------- -# List Source files +# hl_f90CStub lib #----------------------------------------------------------------------------- -SET (HDF5_HL_F90_F_SRCS - ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5TBff.f90 - ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTff.f90 - ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMff.f90 -) - SET (HDF5_HL_F90_C_SRCS ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTfc.c ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMfc.c ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMcc.c ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5TBfc.c ) +SET_SOURCE_FILES_PROPERTIES (${HDF5_HL_F90_C_SRCS} PROPERTIES LANGUAGE C) SET (HDF5_HL_F90_HEADERS ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTf90proto.h) +SET_SOURCE_FILES_PROPERTIES (${HDF5_HL_F90_HEADERS} PROPERTIES LANGUAGE C) ADD_LIBRARY (${HDF5_HL_F90_C_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_F90_C_SRCS} ${HDF5_HL_F90_HEADERS}) -TARGET_LINK_LIBRARIES (${HDF5_HL_F90_C_LIB_TARGET} - ${HDF5_F90_C_LIB_TARGET} - ${HDF5_HL_LIB_TARGET} -) -# -# To Ensure that generated files are built, we must force a dependency -ADD_DEPENDENCIES(${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_F90_C_LIB_TARGET}) +TARGET_LINK_LIBRARIES (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_C_LIB_TARGET} ${HDF5_HL_LIB_TARGET}) +SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_C_LIB_TARGET}") +H5_SET_LIB_OPTIONS (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_HL_F90_C_LIB_NAME} ${LIB_TYPE}) -SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT - "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_C_LIB_TARGET}" +#----------------------------------------------------------------------------- +# Fortran Modules +#----------------------------------------------------------------------------- +SET (HDF5_HL_F90_F_SRCS + ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5TBff.f90 + ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTff.f90 + ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMff.f90 ) -H5_SET_LIB_OPTIONS (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_HL_F90_C_LIB_NAME} ${LIB_TYPE}) ADD_LIBRARY (${HDF5_HL_F90_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_F90_F_SRCS}) +SET (SHARED_LINK_FLAGS " ") IF (BUILD_SHARED_LIBS) IF (WIN32 AND NOT CYGWIN) SET_PROPERTY (TARGET ${HDF5_HL_F90_LIB_TARGET} @@ -58,11 +48,7 @@ IF (BUILD_SHARED_LIBS) BUILD_HDF5_DLL ) IF (MSVC) - SET_TARGET_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE /DLL" - ) + SET (SHARED_LINK_FLAGS "/DLL") ENDIF (MSVC) ENDIF (WIN32 AND NOT CYGWIN) ENDIF (BUILD_SHARED_LIBS) @@ -72,19 +58,15 @@ IF (WIN32 AND NOT CYGWIN) HDF5F90_WINDOWS ) ENDIF (WIN32 AND NOT CYGWIN) +TARGET_FORTRAN_WIN_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} ${SHARED_LINK_FLAGS}) SET_TARGET_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} PROPERTIES LINKER_LANGUAGE Fortran) -TARGET_LINK_LIBRARIES (${HDF5_HL_F90_LIB_TARGET} - ${HDF5_HL_F90_C_LIB_TARGET} - ${HDF5_F90_LIB_TARGET} -) +TARGET_LINK_LIBRARIES (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_LIB_TARGET}) SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_LIB_TARGET}") H5_SET_LIB_OPTIONS (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_LIB_NAME} ${LIB_TYPE}) -ADD_DEPENDENCIES (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_C_LIB_TARGET}) #----------------------------------------------------------------------------- # Add file(s) to CMake Install #----------------------------------------------------------------------------- - INSTALL ( DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/ diff --git a/hl/fortran/src/H5LTf90proto.h b/hl/fortran/src/H5LTf90proto.h index 8a9d6c0..c0de5ea 100755 --- a/hl/fortran/src/H5LTf90proto.h +++ b/hl/fortran/src/H5LTf90proto.h @@ -23,8 +23,8 @@ #include <string.h> -H5_DLL char* HD5f2cstring (_fcd fdesc, int len); -H5_DLL void HD5packFstring (char *src, char *dest, size_t len); +H5_FCDLL char* HD5f2cstring (_fcd fdesc, int len); +H5_FCDLL void HD5packFstring (char *src, char *dest, size_t len); /* @@ -139,7 +139,7 @@ H5_DLL void HD5packFstring (char *src, char *dest, size_t len); # define nh5tbget_table_info_c H5_FC_FUNC_(h5tbget_table_info_c, H5TBGET_TABLE_INFO_C) # define nh5tbget_field_info_c H5_FC_FUNC_(h5tbget_field_info_c, H5TBGET_FIELD_INFO_C) -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_c (hid_t_f *loc_id, int_f *namelen, @@ -149,7 +149,7 @@ nh5ltmake_dataset_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_int1_c (hid_t_f *loc_id, int_f *namelen, @@ -159,7 +159,7 @@ nh5ltmake_dataset_int1_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_int2_c (hid_t_f *loc_id, int_f *namelen, @@ -169,7 +169,7 @@ nh5ltmake_dataset_int2_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_int3_c (hid_t_f *loc_id, int_f *namelen, @@ -179,7 +179,7 @@ nh5ltmake_dataset_int3_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_fl1_c (hid_t_f *loc_id, int_f *namelen, @@ -189,7 +189,7 @@ nh5ltmake_dataset_fl1_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_fl2_c (hid_t_f *loc_id, int_f *namelen, @@ -199,7 +199,7 @@ nh5ltmake_dataset_fl2_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_fl3_c (hid_t_f *loc_id, int_f *namelen, @@ -209,7 +209,7 @@ nh5ltmake_dataset_fl3_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_dl1_c (hid_t_f *loc_id, int_f *namelen, @@ -219,7 +219,7 @@ nh5ltmake_dataset_dl1_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_dl2_c (hid_t_f *loc_id, int_f *namelen, @@ -229,7 +229,7 @@ nh5ltmake_dataset_dl2_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_dl3_c (hid_t_f *loc_id, int_f *namelen, @@ -239,7 +239,7 @@ nh5ltmake_dataset_dl3_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_nint1_c (hid_t_f *loc_id, int_f *namelen, @@ -249,7 +249,7 @@ nh5ltmake_dataset_nint1_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_nint2_c (hid_t_f *loc_id, int_f *namelen, @@ -259,7 +259,7 @@ nh5ltmake_dataset_nint2_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_nint3_c (hid_t_f *loc_id, int_f *namelen, @@ -269,7 +269,7 @@ nh5ltmake_dataset_nint3_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_nfl1_c (hid_t_f *loc_id, int_f *namelen, @@ -279,7 +279,7 @@ nh5ltmake_dataset_nfl1_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_nfl2_c (hid_t_f *loc_id, int_f *namelen, @@ -289,7 +289,7 @@ nh5ltmake_dataset_nfl2_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_nfl3_c (hid_t_f *loc_id, int_f *namelen, @@ -299,7 +299,7 @@ nh5ltmake_dataset_nfl3_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_ndl1_c (hid_t_f *loc_id, int_f *namelen, @@ -309,7 +309,7 @@ nh5ltmake_dataset_ndl1_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_ndl2_c (hid_t_f *loc_id, int_f *namelen, @@ -319,7 +319,7 @@ nh5ltmake_dataset_ndl2_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_ndl3_c (hid_t_f *loc_id, int_f *namelen, @@ -329,7 +329,7 @@ nh5ltmake_dataset_ndl3_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_c (hid_t_f *loc_id, int_f *namelen, @@ -339,7 +339,7 @@ nh5ltread_dataset_c (hid_t_f *loc_id, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_int1_c (hid_t_f *loc_id, int_f *namelen, @@ -348,7 +348,7 @@ nh5ltread_dataset_int1_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_int2_c (hid_t_f *loc_id, int_f *namelen, @@ -357,7 +357,7 @@ nh5ltread_dataset_int2_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_int3_c (hid_t_f *loc_id, int_f *namelen, @@ -366,7 +366,7 @@ nh5ltread_dataset_int3_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_fl1_c (hid_t_f *loc_id, int_f *namelen, @@ -375,7 +375,7 @@ nh5ltread_dataset_fl1_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_fl2_c (hid_t_f *loc_id, int_f *namelen, @@ -384,7 +384,7 @@ nh5ltread_dataset_fl2_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_fl3_c (hid_t_f *loc_id, int_f *namelen, @@ -393,7 +393,7 @@ nh5ltread_dataset_fl3_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_dl1_c (hid_t_f *loc_id, int_f *namelen, @@ -402,7 +402,7 @@ nh5ltread_dataset_dl1_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_dl2_c (hid_t_f *loc_id, int_f *namelen, @@ -411,7 +411,7 @@ nh5ltread_dataset_dl2_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_dl3_c (hid_t_f *loc_id, int_f *namelen, @@ -420,7 +420,7 @@ nh5ltread_dataset_dl3_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_nint1_c (hid_t_f *loc_id, int_f *namelen, @@ -429,7 +429,7 @@ nh5ltread_dataset_nint1_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_nint2_c (hid_t_f *loc_id, int_f *namelen, @@ -438,7 +438,7 @@ nh5ltread_dataset_nint2_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_nint3_c (hid_t_f *loc_id, int_f *namelen, @@ -447,7 +447,7 @@ nh5ltread_dataset_nint3_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_nfl1_c (hid_t_f *loc_id, int_f *namelen, @@ -456,7 +456,7 @@ nh5ltread_dataset_nfl1_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_nfl2_c (hid_t_f *loc_id, int_f *namelen, @@ -465,7 +465,7 @@ nh5ltread_dataset_nfl2_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_nfl3_c (hid_t_f *loc_id, int_f *namelen, @@ -474,7 +474,7 @@ nh5ltread_dataset_nfl3_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_ndl1_c (hid_t_f *loc_id, int_f *namelen, @@ -483,7 +483,7 @@ nh5ltread_dataset_ndl1_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_ndl2_c (hid_t_f *loc_id, int_f *namelen, @@ -492,7 +492,7 @@ nh5ltread_dataset_ndl2_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_ndl3_c (hid_t_f *loc_id, int_f *namelen, @@ -501,7 +501,7 @@ nh5ltread_dataset_ndl3_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltset_attribute_int_c(hid_t_f *loc_id, int_f *namelen, @@ -511,7 +511,7 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id, size_t_f *size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltset_attribute_float_c(hid_t_f *loc_id, int_f *namelen, @@ -521,7 +521,7 @@ nh5ltset_attribute_float_c(hid_t_f *loc_id, size_t_f *size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltset_attribute_double_c(hid_t_f *loc_id, int_f *namelen, @@ -531,7 +531,7 @@ nh5ltset_attribute_double_c(hid_t_f *loc_id, size_t_f *size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltset_attribute_string_c(hid_t_f *loc_id, int_f *namelen, @@ -542,7 +542,7 @@ nh5ltset_attribute_string_c(hid_t_f *loc_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltget_attribute_int_c(hid_t_f *loc_id, int_f *namelen, @@ -551,7 +551,7 @@ nh5ltget_attribute_int_c(hid_t_f *loc_id, _fcd attrname, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltget_attribute_float_c(hid_t_f *loc_id, int_f *namelen, @@ -560,7 +560,7 @@ nh5ltget_attribute_float_c(hid_t_f *loc_id, _fcd attrname, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltget_attribute_double_c(hid_t_f *loc_id, int_f *namelen, @@ -569,7 +569,7 @@ nh5ltget_attribute_double_c(hid_t_f *loc_id, _fcd attrname, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltget_attribute_string_c(hid_t_f *loc_id, int_f *namelen, @@ -578,20 +578,20 @@ nh5ltget_attribute_string_c(hid_t_f *loc_id, _fcd attrname, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltget_dataset_ndims_c(hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *rank); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltfind_dataset_c(hid_t_f *loc_id, int_f *namelen, _fcd name); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltget_dataset_info_c(hid_t_f *loc_id, int_f *namelen, @@ -600,7 +600,7 @@ nh5ltget_dataset_info_c(hid_t_f *loc_id, int_f *type_class, size_t_f *type_size); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltget_attribute_ndims_c(hid_t_f *loc_id, int_f *namelen, @@ -608,7 +608,7 @@ nh5ltget_attribute_ndims_c(hid_t_f *loc_id, int_f *attrnamelen, _fcd attrname, int_f *rank); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltget_attribute_info_c(hid_t_f *loc_id, int_f *namelen, @@ -619,7 +619,7 @@ nh5ltget_attribute_info_c(hid_t_f *loc_id, int_f *type_class, size_t_f *type_size); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_string_c (hid_t_f *loc_id, int_f *namelen, @@ -627,7 +627,7 @@ nh5ltmake_dataset_string_c (hid_t_f *loc_id, int_f *buflen, char *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_string_c (hid_t_f *loc_id, int_f *namelen, @@ -639,7 +639,7 @@ nh5ltread_dataset_string_c (hid_t_f *loc_id, *------------------------------------------------------------------------- */ -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5immake_image_8bit_c (hid_t_f *loc_id, int_f *namelen, @@ -647,14 +647,14 @@ nh5immake_image_8bit_c (hid_t_f *loc_id, hsize_t_f *width, hsize_t_f *height, int_f *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imread_image_c (hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5immake_image_24bit_c (hid_t_f *loc_id, int_f *namelen, @@ -664,7 +664,7 @@ nh5immake_image_24bit_c (hid_t_f *loc_id, hsize_t_f *width, hsize_t_f *height, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imget_image_info_c(hid_t_f *loc_id, int_f *namelen, @@ -677,14 +677,14 @@ nh5imget_image_info_c(hid_t_f *loc_id, _fcd interlace); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imis_image_c(hid_t_f *loc_id, int_f *namelen, _fcd name); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5immake_palette_c (hid_t_f *loc_id, int_f *namelen, @@ -692,7 +692,7 @@ nh5immake_palette_c (hid_t_f *loc_id, hsize_t_f *dims, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imlink_palette_c (hid_t_f *loc_id, int_f *namelen, @@ -700,7 +700,7 @@ nh5imlink_palette_c (hid_t_f *loc_id, int_f *ilen, _fcd pal_name); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imunlink_palette_c (hid_t_f *loc_id, int_f *namelen, @@ -708,7 +708,7 @@ nh5imunlink_palette_c (hid_t_f *loc_id, int_f *ilen, _fcd pal_name); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imget_npalettes_c(hid_t_f *loc_id, int_f *namelen, @@ -716,7 +716,7 @@ nh5imget_npalettes_c(hid_t_f *loc_id, hsize_t_f *npals); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imget_palette_info_c(hid_t_f *loc_id, int_f *namelen, @@ -724,7 +724,7 @@ nh5imget_palette_info_c(hid_t_f *loc_id, int_f *pal_number, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imget_palette_c(hid_t_f *loc_id, int_f *namelen, @@ -732,7 +732,7 @@ nh5imget_palette_c(hid_t_f *loc_id, int_f *pal_number, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imis_palette_c(hid_t_f *loc_id, int_f *namelen, @@ -745,7 +745,7 @@ nh5imis_palette_c(hid_t_f *loc_id, *------------------------------------------------------------------------- */ -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbmake_table_c(int_f *namelen1, _fcd name1, @@ -762,7 +762,7 @@ nh5tbmake_table_c(int_f *namelen1, int_f *len, /* field_names lenghts */ _fcd buf); /* field_names */ -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_name_c(hid_t_f *loc_id, int_f *namelen, @@ -774,7 +774,7 @@ nh5tbwrite_field_name_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_name_int_c(hid_t_f *loc_id, int_f *namelen, @@ -786,7 +786,7 @@ nh5tbwrite_field_name_int_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_name_fl_c(hid_t_f *loc_id, int_f *namelen, @@ -798,7 +798,7 @@ nh5tbwrite_field_name_fl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_name_dl_c(hid_t_f *loc_id, int_f *namelen, @@ -810,7 +810,7 @@ nh5tbwrite_field_name_dl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_name_st_c(hid_t_f *loc_id, int_f *namelen, @@ -822,7 +822,7 @@ nh5tbwrite_field_name_st_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_name_c(hid_t_f *loc_id, int_f *namelen, @@ -834,7 +834,7 @@ nh5tbread_field_name_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_name_int_c(hid_t_f *loc_id, int_f *namelen, @@ -846,7 +846,7 @@ nh5tbread_field_name_int_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_name_fl_c(hid_t_f *loc_id, int_f *namelen, @@ -858,7 +858,7 @@ nh5tbread_field_name_fl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_name_dl_c(hid_t_f *loc_id, int_f *namelen, @@ -870,7 +870,7 @@ nh5tbread_field_name_dl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_name_st_c(hid_t_f *loc_id, int_f *namelen, @@ -882,7 +882,7 @@ nh5tbread_field_name_st_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_index_c(hid_t_f *loc_id, int_f *namelen, @@ -893,7 +893,7 @@ nh5tbwrite_field_index_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_index_int_c(hid_t_f *loc_id, int_f *namelen, @@ -904,7 +904,7 @@ nh5tbwrite_field_index_int_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_index_fl_c(hid_t_f *loc_id, int_f *namelen, @@ -915,7 +915,7 @@ nh5tbwrite_field_index_fl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_index_dl_c(hid_t_f *loc_id, int_f *namelen, @@ -926,7 +926,7 @@ nh5tbwrite_field_index_dl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_index_st_c(hid_t_f *loc_id, int_f *namelen, @@ -937,7 +937,7 @@ nh5tbwrite_field_index_st_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_index_c(hid_t_f *loc_id, int_f *namelen, @@ -948,7 +948,7 @@ nh5tbread_field_index_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_index_int_c(hid_t_f *loc_id, int_f *namelen, @@ -959,7 +959,7 @@ nh5tbread_field_index_int_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_index_fl_c(hid_t_f *loc_id, int_f *namelen, @@ -970,7 +970,7 @@ nh5tbread_field_index_fl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_index_dl_c(hid_t_f *loc_id, int_f *namelen, @@ -981,7 +981,7 @@ nh5tbread_field_index_dl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_index_st_c(hid_t_f *loc_id, int_f *namelen, @@ -992,7 +992,7 @@ nh5tbread_field_index_st_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbinsert_field_c(hid_t_f *loc_id, int_f *namelen, @@ -1003,7 +1003,7 @@ nh5tbinsert_field_c(hid_t_f *loc_id, int_f *position, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbinsert_field_int_c(hid_t_f *loc_id, int_f *namelen, @@ -1013,7 +1013,7 @@ nh5tbinsert_field_int_c(hid_t_f *loc_id, hid_t_f *field_type, int_f *position, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbinsert_field_fl_c(hid_t_f *loc_id, int_f *namelen, @@ -1023,7 +1023,7 @@ nh5tbinsert_field_fl_c(hid_t_f *loc_id, hid_t_f *field_type, int_f *position, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbinsert_field_dl_c(hid_t_f *loc_id, int_f *namelen, @@ -1033,7 +1033,7 @@ nh5tbinsert_field_dl_c(hid_t_f *loc_id, hid_t_f *field_type, int_f *position, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbinsert_field_st_c(hid_t_f *loc_id, int_f *namelen, @@ -1043,7 +1043,7 @@ nh5tbinsert_field_st_c(hid_t_f *loc_id, hid_t_f *field_type, int_f *position, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbdelete_field_c(hid_t_f *loc_id, int_f *namelen, @@ -1052,7 +1052,7 @@ nh5tbdelete_field_c(hid_t_f *loc_id, _fcd field_name); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbget_table_info_c(hid_t_f *loc_id, int_f *namelen, @@ -1060,7 +1060,7 @@ nh5tbget_table_info_c(hid_t_f *loc_id, hsize_t_f *nfields, hsize_t_f *nrecords); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbget_field_info_c(hid_t_f *loc_id, int_f *namelen, diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 94ed7ac..7f8a35f 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -174,6 +174,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@ DIRECT_VFD = @DIRECT_VFD@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ @@ -235,6 +236,7 @@ LTLIBOBJS = @LTLIBOBJS@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ @@ -291,6 +293,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -401,7 +404,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 69 +LT_VERS_REVISION = 70 LT_VERS_AGE = 0 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \ -I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt index 2968943..c9e236e 100644 --- a/hl/fortran/test/CMakeLists.txt +++ b/hl/fortran/test/CMakeLists.txt @@ -5,12 +5,6 @@ PROJECT (HDF5_HL_FORTRAN_TESTS C CXX Fortran) # Add Tests #----------------------------------------------------------------------------- INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src) -LINK_DIRECTORIES ( - ${CMAKE_Fortran_MODULE_DIRECTORY} - ${HDF5_HL_F90_BINARY_DIR} - ${HDF5_F90_BINARY_DIR} - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} -) # Remove any output file left over from previous test run ADD_TEST ( @@ -28,8 +22,8 @@ ADD_TEST ( #-- Adding test for hl_f90_tstlite ADD_EXECUTABLE (hl_f90_tstlite tstlite.f90) -H5_NAMING (hl_f90_tstlite) -TARGET_FORTRAN_WIN_PROPERTIES (hl_f90_tstlite) +H5_NAMING (hl_f90_tstlite ${LIB_TYPE}) +TARGET_FORTRAN_WIN_PROPERTIES (hl_f90_tstlite "") TARGET_LINK_LIBRARIES (hl_f90_tstlite ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET}) SET_TARGET_PROPERTIES (hl_f90_tstlite PROPERTIES LINKER_LANGUAGE Fortran) @@ -37,8 +31,8 @@ ADD_TEST (NAME hl_f90_tstlite COMMAND $<TARGET_FILE:hl_f90_tstlite>) #-- Adding test for hl_f90_tstimage ADD_EXECUTABLE (hl_f90_tstimage tstimage.f90) -H5_NAMING (hl_f90_tstimage) -TARGET_FORTRAN_WIN_PROPERTIES (hl_f90_tstimage) +H5_NAMING (hl_f90_tstimage ${LIB_TYPE}) +TARGET_FORTRAN_WIN_PROPERTIES (hl_f90_tstimage "") TARGET_LINK_LIBRARIES (hl_f90_tstimage ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET}) SET_TARGET_PROPERTIES (hl_f90_tstimage PROPERTIES LINKER_LANGUAGE Fortran) @@ -46,8 +40,8 @@ ADD_TEST (NAME hl_f90_tstimage COMMAND $<TARGET_FILE:hl_f90_tstimage>) #-- Adding test for hl_f90_tsttable ADD_EXECUTABLE (hl_f90_tsttable tsttable.f90) -H5_NAMING (hl_f90_tsttable) -TARGET_FORTRAN_WIN_PROPERTIES (hl_f90_tsttable) +H5_NAMING (hl_f90_tsttable ${LIB_TYPE}) +TARGET_FORTRAN_WIN_PROPERTIES (hl_f90_tsttable "") TARGET_LINK_LIBRARIES (hl_f90_tsttable ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET}) SET_TARGET_PROPERTIES (hl_f90_tsttable PROPERTIES LINKER_LANGUAGE Fortran) diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index f81614b..d43b434 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -148,6 +148,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@ DIRECT_VFD = @DIRECT_VFD@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ @@ -209,6 +210,7 @@ LTLIBOBJS = @LTLIBOBJS@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ @@ -265,6 +267,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index faa6d30..432a725 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -132,12 +132,12 @@ herr_t H5DSattach_scale(hid_t did, hid_t ntid = -1; /* attribute native type ID */ hid_t aid = -1; /* attribute ID */ int rank; /* rank of dataset */ - hsize_t dims[1]; /* dimension of the "REFERENCE_LIST" array */ + hsize_t dims[1]; /* dimension of the "REFERENCE_LIST" array */ ds_list_t dsl; /* attribute data in the DS pointing to the dataset */ - ds_list_t *dsbuf=NULL; /* array of attribute data in the DS pointing to the dataset */ + ds_list_t *dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ hobj_ref_t ref_to_ds; /* reference to the DS */ hobj_ref_t ref_j; /* iterator reference */ - hvl_t *buf=NULL; /* VL buffer to store in the attribute */ + hvl_t *buf = NULL; /* VL buffer to store in the attribute */ hid_t dsid_j; /* DS dataset ID in DIMENSION_LIST */ H5O_info_t oi1, oi2; H5I_type_t it1, it2; @@ -254,8 +254,7 @@ herr_t H5DSattach_scale(hid_t did, goto out; /* allocate and initialize the VL */ - buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t)); - + buf = (hvl_t *)malloc((size_t)rank * sizeof(hvl_t)); if(buf == NULL) goto out; @@ -270,25 +269,21 @@ herr_t H5DSattach_scale(hid_t did, ((hobj_ref_t *)buf[idx].p)[0] = ref_to_ds; /* write the attribute with the reference */ - if (H5Awrite(aid,tid,buf) < 0) + if(H5Awrite(aid, tid, buf) < 0) goto out; /* close */ - if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf) < 0) + if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) goto out; - if (H5Sclose(sid) < 0) + if(H5Sclose(sid) < 0) goto out; - if (H5Tclose(tid) < 0) + if(H5Tclose(tid) < 0) goto out; - if (H5Aclose(aid) < 0) + if(H5Aclose(aid) < 0) goto out; - if (buf) - { - free(buf); - buf = NULL; - } - + free(buf); + buf = NULL; } /*------------------------------------------------------------------------- @@ -296,8 +291,7 @@ herr_t H5DSattach_scale(hid_t did, * and insert the new reference *------------------------------------------------------------------------- */ - - else if ( has_dimlist == 1 ) + else if(has_dimlist == 1) { if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0) goto out; @@ -309,8 +303,7 @@ herr_t H5DSattach_scale(hid_t did, goto out; /* allocate and initialize the VL */ - buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t)); - + buf = (hvl_t *)malloc((size_t)rank * sizeof(hvl_t)); if(buf == NULL) goto out; @@ -320,13 +313,12 @@ herr_t H5DSattach_scale(hid_t did, /* check to avoid inserting duplicates. it is not FAIL, just do nothing */ /* iterate all the REFs in this dimension IDX */ - for (i=0; i<(int)buf[idx].len; i++) - { + for(i = 0; i < (int)buf[idx].len; i++) { /* get the reference */ ref_j = ((hobj_ref_t *)buf[idx].p)[i]; /* get the scale id for this REF */ - if ((dsid_j = H5Rdereference(did,H5R_OBJECT,&ref_j)) < 0) + if((dsid_j = H5Rdereference(did,H5R_OBJECT,&ref_j)) < 0) goto out; /* get info for DS in the parameter list */ @@ -342,48 +334,41 @@ herr_t H5DSattach_scale(hid_t did, found_ds = 1; /* close the dereferenced dataset */ - if (H5Dclose(dsid_j) < 0) + if(H5Dclose(dsid_j) < 0) goto out; - } + } /* end for */ - if (found_ds==0) - { + if(found_ds == 0) { /* we are adding one more DS to this dimension */ - if ( buf[idx].len > 0 ) - { + if(buf[idx].len > 0) { buf[idx].len++; len = buf[idx].len; - buf[idx].p = realloc( buf[idx].p, len * sizeof(hobj_ref_t)); - ((hobj_ref_t *)buf[idx].p)[ len-1 ] = ref_to_ds; - } - else - { + buf[idx].p = realloc(buf[idx].p, len * sizeof(hobj_ref_t)); + ((hobj_ref_t *)buf[idx].p)[len - 1] = ref_to_ds; + } /* end if */ + else { /* store the REF information in the index of the dataset that has the DS */ buf[idx].len = 1; - buf[idx].p = malloc( 1 * sizeof(hobj_ref_t)); + buf[idx].p = malloc(sizeof(hobj_ref_t)); ((hobj_ref_t *)buf[idx].p)[0] = ref_to_ds; - } - } + } /* end else */ + } /* end if */ /* write the attribute with the new references */ - if (H5Awrite(aid,tid,buf) < 0) + if(H5Awrite(aid, tid, buf) < 0) goto out; /* close */ - if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf) < 0) + if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) goto out; - if (H5Sclose(sid) < 0) + if(H5Sclose(sid) < 0) goto out; - if (H5Tclose(tid) < 0) + if(H5Tclose(tid) < 0) goto out; - if (H5Aclose(aid) < 0) + if(H5Aclose(aid) < 0) goto out; - if (buf) - { - free(buf); - buf = NULL; - } - + free(buf); + buf = NULL; } /* has_dimlist */ /*------------------------------------------------------------------------- @@ -392,20 +377,18 @@ herr_t H5DSattach_scale(hid_t did, */ /* try to find the attribute "REFERENCE_LIST" on the >>DS<< dataset */ - if ((has_reflist = H5LT_find_attribute(dsid,REFERENCE_LIST)) < 0) + if((has_reflist = H5LT_find_attribute(dsid, REFERENCE_LIST)) < 0) goto out; /*------------------------------------------------------------------------- * it does not exist. we create the attribute and its reference data *------------------------------------------------------------------------- */ - if (has_reflist == 0) - { - + if(has_reflist == 0) { dims[0] = 1; /* space for the attribute */ - if ((sid = H5Screate_simple(1,dims,NULL)) < 0) + if((sid = H5Screate_simple(1,dims,NULL)) < 0) goto out; /* create the compound datatype for the attribute "REFERENCE_LIST" */ @@ -438,16 +421,13 @@ herr_t H5DSattach_scale(hid_t did, goto out; if(H5Aclose(aid) < 0) goto out; - - } + } /* end if */ /*------------------------------------------------------------------------- * the "REFERENCE_LIST" array already exists, open it and extend it *------------------------------------------------------------------------- */ - - else if(has_reflist == 1) - { + else if(has_reflist == 1) { if((aid = H5Aopen(dsid, REFERENCE_LIST, H5P_DEFAULT)) < 0) goto out; @@ -468,17 +448,16 @@ herr_t H5DSattach_scale(hid_t did, nelmts++; dsbuf = (ds_list_t*) malloc((size_t)nelmts * sizeof(ds_list_t)); - - if (dsbuf == NULL) + if(dsbuf == NULL) goto out; - if (H5Aread(aid,ntid,dsbuf) < 0) + if(H5Aread(aid, ntid, dsbuf) < 0) goto out; /* close */ - if (H5Sclose(sid) < 0) + if(H5Sclose(sid) < 0) goto out; - if (H5Aclose(aid) < 0) + if(H5Aclose(aid) < 0) goto out; /*------------------------------------------------------------------------- @@ -492,7 +471,7 @@ herr_t H5DSattach_scale(hid_t did, /* store the IDX information (index of the dataset that has the DS) */ dsl.dim_idx = idx; - dsbuf[nelmts-1] = dsl; + dsbuf[nelmts - 1] = dsl; /* create a new data space for the new references array */ dims[0] = nelmts; @@ -518,12 +497,8 @@ herr_t H5DSattach_scale(hid_t did, if (H5Tclose(ntid) < 0) goto out; - if (dsbuf) - { - free(dsbuf); - dsbuf = NULL; - } - + free(dsbuf); + dsbuf = NULL; } /* has_reflist */ /*------------------------------------------------------------------------- @@ -531,11 +506,10 @@ herr_t H5DSattach_scale(hid_t did, *------------------------------------------------------------------------- */ - if ((is_ds=H5DSis_scale(dsid)) < 0) + if((is_ds=H5DSis_scale(dsid)) < 0) return FAIL; - if (is_ds == 0 ) - { + if(is_ds == 0) { if (H5LT_set_attribute_string(dsid,"CLASS",DIMENSION_SCALE_CLASS) < 0) return FAIL; } @@ -544,17 +518,10 @@ herr_t H5DSattach_scale(hid_t did, /* error zone */ out: - - if (buf) - { + if(buf) free(buf); - buf = NULL; - } - if (dsbuf) - { + if(dsbuf) free(dsbuf); - dsbuf = NULL; - } H5E_BEGIN_TRY { H5Sclose(sid); @@ -706,13 +673,12 @@ herr_t H5DSdetach_scale(hid_t did, goto out; /* allocate and initialize the VL */ - buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t)); - + buf = (hvl_t *)malloc((size_t)rank * sizeof(hvl_t)); if(buf == NULL) goto out; /* read */ - if (H5Aread(aid,tid,buf) < 0) + if(H5Aread(aid, tid, buf) < 0) goto out; /* reset */ @@ -747,7 +713,8 @@ herr_t H5DSdetach_scale(hid_t did, and reset to NULL */ size_t len = buf[idx].len; - if(j<len-1) + + if(j < len - 1) ((hobj_ref_t *)buf[idx].p)[j] = ((hobj_ref_t *)buf[idx].p)[len-1]; len = --buf[idx].len; if(len == 0) { @@ -768,36 +735,33 @@ herr_t H5DSdetach_scale(hid_t did, /* Write the attribute, but check first, if we have any scales left, because if not, we should delete the attribute according to the spec */ - for(i=0; i < rank; i++) { + for(i = 0; i < rank; i++) { if(buf[i].len > 0) { have_ds = 1; break; } } if(have_ds) { - if(H5Awrite(aid,tid,buf) < 0) + if(H5Awrite(aid, tid, buf) < 0) goto out; } else { - if(H5Adelete(did,DIMENSION_LIST) < 0) + if(H5Adelete(did, DIMENSION_LIST) < 0) goto out; } /* close */ - if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf) < 0) + if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) goto out; - if (H5Sclose(sid) < 0) + if(H5Sclose(sid) < 0) goto out; - if (H5Tclose(tid) < 0) + if(H5Tclose(tid) < 0) goto out; - if (H5Aclose(aid) < 0) + if(H5Aclose(aid) < 0) goto out; - if (buf) - { - free(buf); - buf = NULL; - } + free(buf); + buf = NULL; /*------------------------------------------------------------------------- @@ -826,7 +790,7 @@ herr_t H5DSdetach_scale(hid_t did, if(dsbuf == NULL) goto out; - if (H5Aread(aid,ntid,dsbuf) < 0) + if(H5Aread(aid, ntid, dsbuf) < 0) goto out; for(ii=0; ii<nelmts; ii++) { @@ -914,12 +878,8 @@ herr_t H5DSdetach_scale(hid_t did, if (H5Tclose(ntid) < 0) goto out; - if (dsbuf) - { - free(dsbuf); - dsbuf=NULL; - } - + free(dsbuf); + dsbuf = NULL; return SUCCEED; @@ -931,21 +891,19 @@ out: H5Tclose(ntid); H5Tclose(tid); - if (dsbuf) - { + if(dsbuf) { free(dsbuf); - dsbuf=NULL; + dsbuf = NULL; } - if (buf) - { + if(buf) { /* Failure occured before H5Dvlen_reclaim was called; free the pointers allocated when we read data in */ - for(i=0; i<rank; i++) { + for(i = 0; i < rank; i++) { if(buf[i].p) free(buf[i].p); } free(buf); - buf=NULL; + buf = NULL; } } H5E_END_TRY; return FAIL; @@ -991,9 +949,9 @@ htri_t H5DSis_attached(hid_t did, hid_t ntid = -1; /* attribute native type ID */ hid_t aid = -1; /* attribute ID */ int rank; /* rank of dataset */ - ds_list_t *dsbuf; /* array of attribute data in the DS pointing to the dataset */ + ds_list_t *dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ hobj_ref_t ref; /* reference to the DS */ - hvl_t *buf; /* VL buffer to store in the attribute */ + hvl_t *buf = NULL; /* VL buffer to store in the attribute */ hid_t dsid_j; /* DS dataset ID in DIMENSION_LIST */ hid_t did_i; /* dataset ID in REFERENCE_LIST */ H5O_info_t oi1, oi2, oi3, oi4; @@ -1078,7 +1036,6 @@ htri_t H5DSis_attached(hid_t did, /* allocate and initialize the VL */ buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t)); - if(buf == NULL) goto out; @@ -1124,11 +1081,8 @@ htri_t H5DSis_attached(hid_t did, goto out; if (H5Aclose(aid) < 0) goto out; - if (buf) - { - free(buf); - buf = NULL; - } + free(buf); + buf = NULL; } /* has_dimlist */ /*------------------------------------------------------------------------- @@ -1217,11 +1171,9 @@ htri_t H5DSis_attached(hid_t did, goto out; if (H5Aclose(aid) < 0) goto out; - if (dsbuf) - { - free(dsbuf); - dsbuf = NULL; - } + + free(dsbuf); + dsbuf = NULL; } /* has_reflist */ if (found_ds && found_dset) @@ -1238,13 +1190,11 @@ out: H5Tclose(ntid); } H5E_END_TRY; - if (buf) - { + if (buf) { free(buf); buf = NULL; } - if (dsbuf) - { + if(dsbuf) { free(dsbuf); dsbuf = NULL; } @@ -1307,7 +1257,7 @@ herr_t H5DSiterate_scales(hid_t did, hid_t sid; /* space ID */ hid_t tid = -1; /* attribute type ID */ hid_t aid = -1; /* attribute ID */ - hvl_t *buf=NULL; /* VL buffer to store in the attribute */ + hvl_t *buf = NULL; /* VL buffer to store in the attribute */ H5I_type_t it; /* ID type */ herr_t ret_value=0; int j_idx; @@ -1431,20 +1381,16 @@ herr_t H5DSiterate_scales(hid_t did, goto out; if (H5Aclose(aid) < 0) goto out; - if (buf) - { - free(buf); - buf = NULL; - } + free(buf); + buf = NULL; } /* if has_dimlist */ return ret_value; out: H5E_BEGIN_TRY { - if (buf) - { + if(buf) { H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf); free(buf); } @@ -1452,6 +1398,7 @@ out: H5Aclose(aid); H5Tclose(tid); } H5E_END_TRY; + return FAIL; } @@ -2048,7 +1995,7 @@ int H5DSget_num_scales(hid_t did, hid_t tid = -1; /* attribute type ID */ hid_t aid = -1; /* attribute ID */ int rank; /* rank of dataset */ - hvl_t *buf; /* VL buffer to store in the attribute */ + hvl_t *buf = NULL; /* VL buffer to store in the attribute */ H5I_type_t it; /* ID type */ int nscales; @@ -2057,10 +2004,10 @@ int H5DSget_num_scales(hid_t did, *------------------------------------------------------------------------- */ /* get ID type */ - if ((it = H5Iget_type(did)) < 0) + if((it = H5Iget_type(did)) < 0) return FAIL; - if (H5I_DATASET!=it) + if(H5I_DATASET != it) return FAIL; /*------------------------------------------------------------------------- @@ -2068,19 +2015,19 @@ int H5DSget_num_scales(hid_t did, *------------------------------------------------------------------------- */ /* get dataset space */ - if ((sid = H5Dget_space(did)) < 0) + if((sid = H5Dget_space(did)) < 0) return FAIL; /* get rank */ - if ((rank=H5Sget_simple_extent_ndims(sid)) < 0) + if((rank = H5Sget_simple_extent_ndims(sid)) < 0) goto out; /* close dataset space */ - if (H5Sclose(sid) < 0) + if(H5Sclose(sid) < 0) goto out; /* dimemsion index IDX range checking */ - if (idx>=(unsigned int )rank) + if(idx >= (unsigned int )rank) return FAIL; /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */ @@ -2095,9 +2042,7 @@ int H5DSget_num_scales(hid_t did, * the attribute exists, open it *------------------------------------------------------------------------- */ - - else - { + else { if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0) goto out; if((tid = H5Aget_type(aid)) < 0) @@ -2106,8 +2051,7 @@ int H5DSget_num_scales(hid_t did, goto out; /* allocate and initialize the VL */ - buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t)); - + buf = (hvl_t *)malloc((size_t)rank * sizeof(hvl_t)); if(buf == NULL) goto out; @@ -2115,23 +2059,19 @@ int H5DSget_num_scales(hid_t did, if(H5Aread(aid, tid, buf) < 0) goto out; - nscales=(int)buf[idx].len; + nscales = (int)buf[idx].len; /* close */ - if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf) < 0) + if(H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf) < 0) goto out; - if (H5Sclose(sid) < 0) + if(H5Sclose(sid) < 0) goto out; - if (H5Tclose(tid) < 0) + if(H5Tclose(tid) < 0) goto out; - if (H5Aclose(aid) < 0) + if(H5Aclose(aid) < 0) goto out; - if (buf) - { - free(buf); - buf = NULL; - } - + free(buf); + buf = NULL; } /* has_dimlist */ return nscales; @@ -2144,11 +2084,9 @@ out: H5Tclose(tid); } H5E_END_TRY; - if (buf) - { + if(buf) free(buf); - buf = NULL; - } + return FAIL; } diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 3b47dcc..2e04858 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -165,6 +165,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@ DIRECT_VFD = @DIRECT_VFD@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ @@ -226,6 +227,7 @@ LTLIBOBJS = @LTLIBOBJS@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ @@ -282,6 +284,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -392,7 +395,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 69 +LT_VERS_REVISION = 70 LT_VERS_AGE = 0 # This library is our main target. diff --git a/hl/test/CMakeLists.txt b/hl/test/CMakeLists.txt index 22568ae..4c345dd 100644 --- a/hl/test/CMakeLists.txt +++ b/hl/test/CMakeLists.txt @@ -22,8 +22,7 @@ INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR}) # -------------------------------------------------------------------- MACRO (HL_ADD_TEST hl_name files) ADD_EXECUTABLE (hl_${hl_name} ${hl_name}.c) - H5_NAMING (hl_${hl_name}) - TARGET_WIN_PROPERTIES (hl_${hl_name}) + H5_NAMING (hl_${hl_name} ${LIB_TYPE}) TARGET_LINK_LIBRARIES (hl_${hl_name} ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} @@ -87,8 +86,7 @@ HL_ADD_TEST (test_table "test_table_be.hdf5;test_table_cray.hdf5;test_table_le.h # -------------------------------------------------------------------- IF (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS) ADD_EXECUTABLE (hl_gen_test_ds gen_test_ds.c) - H5_NAMING (hl_gen_test_ds) - TARGET_WIN_PROPERTIES (hl_gen_test_ds) + H5_NAMING (hl_gen_test_ds ${LIB_TYPE}) TARGET_LINK_LIBRARIES (hl_gen_test_ds ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 831048c..4e639a6 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -169,6 +169,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@ DIRECT_VFD = @DIRECT_VFD@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ @@ -230,6 +231,7 @@ LTLIBOBJS = @LTLIBOBJS@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ @@ -286,6 +288,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ diff --git a/hl/tools/CMakeLists.txt b/hl/tools/CMakeLists.txt index 8ed3fab..df45631 100644 --- a/hl/tools/CMakeLists.txt +++ b/hl/tools/CMakeLists.txt @@ -18,8 +18,7 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib) INCLUDE_DIRECTORIES (${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5) ADD_EXECUTABLE (gif2h5 ${GIF2H5_SRCS}) -H5_NAMING (gif2h5) -TARGET_WIN_PROPERTIES (gif2h5) +H5_NAMING (gif2h5 ${LIB_TYPE}) TARGET_LINK_LIBRARIES (gif2h5 ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) #-- Add h52gif program @@ -28,8 +27,7 @@ SET (hdf2gif_SRCS ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/hdfgifwr.c ) ADD_EXECUTABLE (hdf2gif ${hdf2gif_SRCS}) -H5_NAMING (hdf2gif) -TARGET_WIN_PROPERTIES (hdf2gif) +H5_NAMING (hdf2gif ${LIB_TYPE}) TARGET_LINK_LIBRARIES (hdf2gif ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) # -------------------------------------------------------------------- @@ -39,8 +37,7 @@ TARGET_LINK_LIBRARIES (hdf2gif ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_T # -------------------------------------------------------------------- IF (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS) ADD_EXECUTABLE (hl_h52gifgentest ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/h52gifgentst.c) - H5_NAMING (hl_h52gifgentest) - TARGET_WIN_PROPERTIES (hl_h52gifgentest) + H5_NAMING (hl_h52gifgentest ${LIB_TYPE}) TARGET_LINK_LIBRARIES (hl_h52gifgentest ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET}) # ADD_TEST (NAME hl_h52gifgentest COMMAND $<TARGET_FILE:hl_h52gifgentest>) diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index d0fa11a..20d761d 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -154,6 +154,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@ DIRECT_VFD = @DIRECT_VFD@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ @@ -215,6 +216,7 @@ LTLIBOBJS = @LTLIBOBJS@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ @@ -271,6 +273,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index eae6de5..3b6d2da 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -154,6 +154,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@ DIRECT_VFD = @DIRECT_VFD@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ @@ -215,6 +216,7 @@ LTLIBOBJS = @LTLIBOBJS@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ @@ -271,6 +273,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |