diff options
44 files changed, 1339 insertions, 539 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cda2dad..304d86d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,6 +249,17 @@ ELSE (BUILD_SHARED_LIBS) ENDIF (BUILD_SHARED_LIBS) #----------------------------------------------------------------------------- +# Option to Build Static executables +#----------------------------------------------------------------------------- +OPTION (BUILD_STATIC_EXECS "Build Static Executabless" OFF) +IF (BUILD_STATIC_EXECS) + IF (NOT WIN32) + SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static") + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static") + ENDIF (NOT WIN32) +ENDIF (BUILD_STATIC_EXECS) + +#----------------------------------------------------------------------------- # Option to use code coverage #----------------------------------------------------------------------------- OPTION (HDF5_ENABLE_COVERAGE "Enable code coverage for Libraries and Programs" OFF) @@ -478,7 +489,6 @@ IF (HDF5_ENABLE_Z_LIB_SUPPORT) # [SVN_REVISION rev] INSTALL_COMMAND "" CMAKE_ARGS - -DBLDTYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} ) ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN") @@ -489,7 +499,6 @@ IF (HDF5_ENABLE_Z_LIB_SUPPORT) URL_MD5 "" INSTALL_COMMAND "" CMAKE_ARGS - -DBLDTYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} ) ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") @@ -568,7 +577,6 @@ IF (HDF5_ENABLE_SZIP_SUPPORT) # [SVN_REVISION rev] INSTALL_COMMAND "" CMAKE_ARGS - -DBLDTYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} -DSZIP_ENABLE_ENCODING:BOOL=${HDF5_ENABLE_SZIP_ENCODING} ) @@ -580,7 +588,6 @@ IF (HDF5_ENABLE_SZIP_SUPPORT) URL_MD5 "" INSTALL_COMMAND "" CMAKE_ARGS - -DBLDTYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} -DSZIP_ENABLE_ENCODING:BOOL=${HDF5_ENABLE_SZIP_ENCODING} ) @@ -825,11 +832,12 @@ SET (H5_FC_FUNC_ "H5_FC_FUNC_(name,NAME) name ## _") IF (EXISTS "${HDF5_SOURCE_DIR}/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/fortran") OPTION (HDF5_BUILD_FORTRAN "Build FORTRAN support" OFF) IF (HDF5_BUILD_FORTRAN) + INCLUDE (${HDF5_RESOURCES_DIR}/HDF5UseFortran.cmake) ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/fortran ${PROJECT_BINARY_DIR}/fortran) IF (HDF5_BUILD_HL_LIB) IF (EXISTS "${HDF5_SOURCE_DIR}/hl/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl/fortran") #-- Build the High Level Fortran source codes - ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/hl/fortran ${HDF5_BINARY_DIR}/hl/fortran) + ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/hl/fortran ${PROJECT_BINARY_DIR}/hl/fortran) ENDIF (EXISTS "${HDF5_SOURCE_DIR}/hl/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl/fortran") ENDIF (HDF5_BUILD_HL_LIB) ENDIF (HDF5_BUILD_FORTRAN) @@ -1028,7 +1036,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED) ELSE (WIN32 AND NOT CYGWIN) SET (release_files ${release_files} - ${HDF5_SOURCE_DIR}/release_docs/INSTALL_cygwin.txt + ${HDF5_SOURCE_DIR}/release_docs/INSTALL_Cygwin.txt ${HDF5_SOURCE_DIR}/release_docs/INSTALL_MinGW.txt ${HDF5_SOURCE_DIR}/release_docs/INSTALL_VMS.txt ) @@ -1064,7 +1072,8 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED) SET (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/release_docs/RELEASE.txt") ENDIF (EXISTS "${HDF5_SOURCE_DIR}/release_docs") SET (CPACK_PACKAGE_RELOCATABLE TRUE) - + #only needed for cmake 2.8.3 + SET (CPACK_MONOLITHIC_INSTALL 1) IF (WIN32) SET (CPACK_NSIS_CONTACT "help@hdfgroup.org") SET (CPACK_NSIS_MODIFY_PATH ON) diff --git a/CTestConfig.cmake b/CTestConfig.cmake index f698b1e..e17a745 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -16,7 +16,9 @@ SET (UPDATE_TYPE svn) SET (VALGRIND_COMMAND "/usr/bin/valgrind") SET (VALGRIND_COMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe") SET (MEMORYCHECK_COMMAND "/usr/bin/valgrind") +SET (MEMORYCHECKCOMMAND "/usr/bin/valgrind") SET (CTEST_MEMORYCHECK_COMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe") +SET (CTEST_MEMORYCHECKCOMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe") SET (CTEST_TESTING_TIMEOUT 3600) SET (DART_TESTING_TIMEOUT 3600) @@ -410,11 +410,11 @@ ./release_docs/INSTALL_VMS.txt ./release_docs/INSTALL_Windows.txt ./release_docs/USING_Windows.txt -./release_docs/CMake.txt ./release_docs/INSTALL_Windows_From_Command_Line.txt ./release_docs/INSTALL_Windows_Short_NET.TXT ./release_docs/INSTALL_Windows_Short_VS2005.TXT ./release_docs/INSTALL_Windows_Short_VS2008.TXT +./release_docs/CMake.txt ./release_docs/INSTALL_parallel ./release_docs/RELEASE.txt @@ -1961,9 +1961,10 @@ ./config/cmake/hdf5-config.cmake.install.in ./config/cmake/hdf5-config-version.cmake.in ./config/cmake/HDF5Macros.cmake +./config/cmake/HDF5UseFortran.cmake ./config/cmake/libhdf5.settings.cmake.in -./config/cmake/mccacheinit.cmake ./config/cmake/cacheinit.cmake +./config/cmake/mccacheinit.cmake ./config/cmake/CTest.cmake ./config/cmake/grepTest.cmake ./config/cmake/runTest.cmake @@ -2287,6 +2288,8 @@ ./windows/test/dtransformdll/dtransformdll.vcproj ./windows/test/dtypes/dtypes.vcproj ./windows/test/dtypesdll/dtypesdll.vcproj +./windows/test/efc/efc.vcproj +./windows/test/efcdll/efcdll.vcproj ./windows/test/earray/earray.vcproj ./windows/test/earraydll/earraydll.vcproj ./windows/test/enum/enum.vcproj diff --git a/config/cmake/HDF5UseFortran.cmake b/config/cmake/HDF5UseFortran.cmake new file mode 100644 index 0000000..1f429f5 --- /dev/null +++ b/config/cmake/HDF5UseFortran.cmake @@ -0,0 +1,121 @@ +# +# This file provides functions for Fortran support. +# +#------------------------------------------------------------------------------- +ENABLE_LANGUAGE (Fortran) + +#----------------------------------------------------------------------------- +# Detect name mangling convention used between Fortran and C +#----------------------------------------------------------------------------- +INCLUDE (FortranCInterface) +FortranCInterface_HEADER ( + ${CMAKE_BINARY_DIR}/FCMangle.h + MACRO_NAMESPACE "H5_FC_" + SYMBOL_NAMESPACE "H5_FC_" + SYMBOLS mysub mymod:my_sub +) + +FILE (STRINGS ${CMAKE_BINARY_DIR}/FCMangle.h CONTENTS REGEX "H5_FC_GLOBAL\\(.*,.*\\) +(.*)") +STRING (REGEX MATCH "H5_FC_GLOBAL\\(.*,.*\\) +(.*)" RESULT ${CONTENTS}) +SET (H5_FC_FUNC "H5_FC_FUNC(name,NAME) ${CMAKE_MATCH_1}") + +FILE (STRINGS ${CMAKE_BINARY_DIR}/FCMangle.h CONTENTS REGEX "H5_FC_GLOBAL_\\(.*,.*\\) +(.*)") +STRING (REGEX MATCH "H5_FC_GLOBAL_\\(.*,.*\\) +(.*)" RESULT ${CONTENTS}) +SET (H5_FC_FUNC_ "H5_FC_FUNC_(name,NAME) ${CMAKE_MATCH_1}") + +#----------------------------------------------------------------------------- +# The provided CMake Fortran macros don't provide a general check function +# so this one is used for a sizeof test. +#----------------------------------------------------------------------------- +MACRO (CHECK_FORTRAN_FEATURE FUNCTION CODE VARIABLE) + IF (NOT DEFINED ${VARIABLE}) + MESSAGE (STATUS "Testing Fortran ${FUNCTION}") + IF (CMAKE_REQUIRED_LIBRARIES) + SET (CHECK_FUNCTION_EXISTS_ADD_LIBRARIES + "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") + ELSE (CMAKE_REQUIRED_LIBRARIES) + SET (CHECK_FUNCTION_EXISTS_ADD_LIBRARIES) + ENDIF (CMAKE_REQUIRED_LIBRARIES) + FILE (WRITE + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler.f + "${CODE}" + ) + TRY_COMPILE (${VARIABLE} + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler.f + CMAKE_FLAGS "${CHECK_FUNCTION_EXISTS_ADD_LIBRARIES}" + OUTPUT_VARIABLE OUTPUT + ) + +# MESSAGE ( "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ") +# MESSAGE ( "Test result ${OUTPUT}") +# MESSAGE ( "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ") + + IF (${VARIABLE}) + SET (${VARIABLE} 1 CACHE INTERNAL "Have Fortran function ${FUNCTION}") + MESSAGE (STATUS "Testing Fortran ${FUNCTION} - OK") + FILE (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Determining if the Fortran ${FUNCTION} exists passed with the following output:\n" + "${OUTPUT}\n\n" + ) + ELSE (${VARIABLE}) + MESSAGE (STATUS "Testing Fortran ${FUNCTION} - Fail") + SET (${VARIABLE} "" CACHE INTERNAL "Have Fortran function ${FUNCTION}") + FILE (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Determining if the Fortran ${FUNCTION} exists failed with the following output:\n" + "${OUTPUT}\n\n") + ENDIF (${VARIABLE}) + ENDIF (NOT DEFINED ${VARIABLE}) +ENDMACRO (CHECK_FORTRAN_FEATURE) + +#----------------------------------------------------------------------------- +# Configure Checks which require Fortran compilation must go in here +# not in the main ConfigureChecks.cmake files, because if the user has +# no Fortran compiler, problems arise. +# +# Be careful with leading spaces here, do not remove them. +#----------------------------------------------------------------------------- +CHECK_FORTRAN_FEATURE(sizeof + " + PROGRAM main + i = sizeof(x) + END PROGRAM + " + FORTRAN_HAVE_SIZEOF +) + +CHECK_FORTRAN_FEATURE(RealIsNotDouble + " + MODULE type_mod + INTERFACE h5t + MODULE PROCEDURE h5t_real + MODULE PROCEDURE h5t_dble + END INTERFACE + CONTAINS + SUBROUTINE h5t_real(r) + REAL :: r + END SUBROUTINE h5t_real + SUBROUTINE h5t_dble(d) + DOUBLE PRECISION :: d + END SUBROUTINE h5t_dble + END MODULE type_mod + PROGRAM main + USE type_mod + REAL :: r + DOUBLE PRECISION :: d + CALL h5t(r) + CALL h5t(d) + END PROGRAM main + " + FORTRAN_DEFAULT_REAL_NOT_DOUBLE +) + +#----------------------------------------------------------------------------- +# 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) diff --git a/fortran/CMakeLists.txt b/fortran/CMakeLists.txt index a4bfb17..1a6329f 100644 --- a/fortran/CMakeLists.txt +++ b/fortran/CMakeLists.txt @@ -2,142 +2,11 @@ cmake_minimum_required (VERSION 2.8) PROJECT (HDF5_F90 C CXX Fortran) #----------------------------------------------------------------------------- -# Detect name mangling convention used between Fortran and C -#----------------------------------------------------------------------------- -INCLUDE (FortranCInterface) -FortranCInterface_HEADER ( - ${HDF5_F90_BINARY_DIR}/FCMangle.h - MACRO_NAMESPACE "H5_FC_" - SYMBOL_NAMESPACE "H5_FC_" - SYMBOLS mysub mymod:my_sub -) - -FILE (STRINGS ${HDF5_F90_BINARY_DIR}/FCMangle.h CONTENTS REGEX "H5_FC_GLOBAL\\(.*,.*\\) +(.*)") -STRING (REGEX MATCH "H5_FC_GLOBAL\\(.*,.*\\) +(.*)" RESULT ${CONTENTS}) -SET (H5_FC_FUNC "H5_FC_FUNC(name,NAME) ${CMAKE_MATCH_1}" PARENT_SCOPE) - -FILE (STRINGS ${HDF5_F90_BINARY_DIR}/FCMangle.h CONTENTS REGEX "H5_FC_GLOBAL_\\(.*,.*\\) +(.*)") -STRING (REGEX MATCH "H5_FC_GLOBAL_\\(.*,.*\\) +(.*)" RESULT ${CONTENTS}) -SET (H5_FC_FUNC_ "H5_FC_FUNC_(name,NAME) ${CMAKE_MATCH_1}" PARENT_SCOPE) - -#----------------------------------------------------------------------------- -# The provided CMake Fortran macros don't provide a general check function -# so this one is used for a sizeof test. -#----------------------------------------------------------------------------- -MACRO (CHECK_FORTRAN_FEATURE FUNCTION CODE VARIABLE) - IF (NOT DEFINED ${VARIABLE}) - MESSAGE (STATUS "Testing Fortran ${FUNCTION}") - IF (CMAKE_REQUIRED_LIBRARIES) - SET (CHECK_FUNCTION_EXISTS_ADD_LIBRARIES - "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") - ELSE (CMAKE_REQUIRED_LIBRARIES) - SET (CHECK_FUNCTION_EXISTS_ADD_LIBRARIES) - ENDIF (CMAKE_REQUIRED_LIBRARIES) - FILE (WRITE - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler.f - "${CODE}" - ) - TRY_COMPILE (${VARIABLE} - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler.f - CMAKE_FLAGS "${CHECK_FUNCTION_EXISTS_ADD_LIBRARIES}" - OUTPUT_VARIABLE OUTPUT - ) - -# MESSAGE ( "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ") -# MESSAGE ( "Test result ${OUTPUT}") -# MESSAGE ( "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ") - - IF (${VARIABLE}) - SET (${VARIABLE} 1 CACHE INTERNAL "Have Fortran function ${FUNCTION}") - MESSAGE (STATUS "Testing Fortran ${FUNCTION} - OK") - FILE (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Determining if the Fortran ${FUNCTION} exists passed with the following output:\n" - "${OUTPUT}\n\n" - ) - ELSE (${VARIABLE}) - MESSAGE (STATUS "Testing Fortran ${FUNCTION} - Fail") - SET (${VARIABLE} "" CACHE INTERNAL "Have Fortran function ${FUNCTION}") - FILE (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Determining if the Fortran ${FUNCTION} exists failed with the following output:\n" - "${OUTPUT}\n\n") - ENDIF (${VARIABLE}) - ENDIF (NOT DEFINED ${VARIABLE}) -ENDMACRO (CHECK_FORTRAN_FEATURE) - -#----------------------------------------------------------------------------- -# Configure Checks which require Fortran compilation must go in here -# not in the main ConfigureChecks.cmake files, because if the user has -# no Fortran compiler, problems arise. -# -# Be careful with leading spaces here, do not remove them. -#----------------------------------------------------------------------------- -CHECK_FORTRAN_FEATURE(sizeof - " - PROGRAM main - i = sizeof(x) - END PROGRAM - " - FORTRAN_HAVE_SIZEOF -) - -CHECK_FORTRAN_FEATURE(RealIsNotDouble - " - MODULE type_mod - INTERFACE h5t - MODULE PROCEDURE h5t_real - MODULE PROCEDURE h5t_dble - END INTERFACE - CONTAINS - SUBROUTINE h5t_real(r) - REAL :: r - END SUBROUTINE h5t_real - SUBROUTINE h5t_dble(d) - DOUBLE PRECISION :: d - END SUBROUTINE h5t_dble - END MODULE type_mod - PROGRAM main - USE type_mod - REAL :: r - DOUBLE PRECISION :: d - CALL h5t(r) - CALL h5t(d) - END PROGRAM main - " - FORTRAN_DEFAULT_REAL_NOT_DOUBLE -) - -#----------------------------------------------------------------------------- -# Make sure generated files and modules are picked up correctly -#----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES ( - ${CMAKE_Fortran_MODULE_DIRECTORY} - ${HDF5_F90_BINARY_DIR} -) - -#----------------------------------------------------------------------------- -# 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) - -#----------------------------------------------------------------------------- # Traverse source subdirectory #----------------------------------------------------------------------------- ADD_SUBDIRECTORY (${HDF5_F90_SOURCE_DIR}/src ${HDF5_F90_BINARY_DIR}/src) #----------------------------------------------------------------------------- -# When building utility executables we reuse these variables -#----------------------------------------------------------------------------- -#inherit EXE_EXT from parent HDF5 cmake project -#inherit MAKE_SYSTEM from parent HDF5 cmake project -#inherit CFG_INIT from parent HDF5 cmake project - -#----------------------------------------------------------------------------- # Build the Fortran Examples #----------------------------------------------------------------------------- IF (HDF5_BUILD_EXAMPLES) diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt index c0ddf32..b1a9b90 100644 --- a/fortran/examples/CMakeLists.txt +++ b/fortran/examples/CMakeLists.txt @@ -9,11 +9,6 @@ PROJECT (HDF5_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 ( - ${CMAKE_Fortran_MODULE_DIRECTORY} - ${HDF5_F90_BINARY_DIR} - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} -) #----------------------------------------------------------------------------- # Define Sources diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index 6a88eca..d5cbc1b 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -74,6 +74,7 @@ ADD_CUSTOM_COMMAND ( DEPENDS H5fortran_detect ) +INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${CMAKE_Fortran_MODULE_DIRECTORY}) #----------------------------------------------------------------------------- ADD_EXECUTABLE (H5match_types ${HDF5_F90_BINARY_DIR}/H5fort_type_defines.h diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt index 3c905e7..df370bf 100644 --- a/fortran/test/CMakeLists.txt +++ b/fortran/test/CMakeLists.txt @@ -5,19 +5,11 @@ PROJECT (HDF5_FORTRAN_TESTS C CXX Fortran) # Setup include Directories #----------------------------------------------------------------------------- INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src) -LINK_DIRECTORIES ( - ${CMAKE_Fortran_MODULE_DIRECTORY} - ${HDF5_F90_BINARY_DIR} - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} -) #----------------------------------------------------------------------------- # Add Test Lib #----------------------------------------------------------------------------- ADD_LIBRARY (${HDF5_F90_C_TEST_LIB_TARGET} ${LIB_TYPE} t.c) -# Must explicity add a dependency here to force the generation of headers -# which are created for ${HDF5_F90_C_LIB_TARGET} -#ADD_DEPENDENCIES(${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ) TARGET_LINK_LIBRARIES (${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_C_LIB_TARGET} ${HDF5_TEST_LIB_TARGET} @@ -25,11 +17,6 @@ TARGET_LINK_LIBRARIES (${HDF5_F90_C_TEST_LIB_TARGET} H5_SET_LIB_OPTIONS (${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_C_TEST_LIB_NAME} ${LIB_TYPE}) ADD_LIBRARY (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf.f90) -# Must explicity add a dependency here to force the generation of headers -# which are created for ${HDF5_F90_C_LIB_TARGET} -ADD_DEPENDENCIES(${HDF5_F90_TEST_LIB_TARGET} - ${HDF5_F90_C_TEST_LIB_TARGET} -) SET (SHARED_LINK_FLAGS " ") IF (WIN32 AND NOT CYGWIN) IF (BUILD_SHARED_LIBS) diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt index 9cfbae5..c94640a 100644 --- a/fortran/testpar/CMakeLists.txt +++ b/fortran/testpar/CMakeLists.txt @@ -5,11 +5,6 @@ PROJECT (HDF5_FORTRAN_TESTPAR C CXX Fortran) # Setup include Directories #----------------------------------------------------------------------------- INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src) -LINK_DIRECTORIES ( - ${CMAKE_Fortran_MODULE_DIRECTORY} - ${HDF5_F90_BINARY_DIR} - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} -) #----------------------------------------------------------------------------- # Add Tests diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt index 9ce3043..0c0ad91 100644 --- a/hl/CMakeLists.txt +++ b/hl/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required (VERSION 2.8) -PROJECT (HDF5_HL) +PROJECT (HDF5_HL C CXX) #----------------------------------------------------------------------------- # Shared Libs 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/examples/CMakeLists.txt b/hl/fortran/examples/CMakeLists.txt index 698407d..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 diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index ca0a35f..763a315 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -5,50 +5,39 @@ 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 + ${HDF5_F90_SRC_DIR}/src + ${HDF5_F90_BINARY_DIR + ${CMAKE_Fortran_MODULE_DIRECTORY}} ) -LINK_DIRECTORIES ( - ${CMAKE_Fortran_MODULE_DIRECTORY} - ${HDF5_HL_F90_BINARY_DIR} - ${HDF5_F90_BINARY_DIR} - ${CMAKE_LIBRARY_OUTPUT_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 " ") @@ -71,18 +60,13 @@ IF (WIN32 AND NOT CYGWIN) 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 3e45531..c0de5ea 100755 --- a/hl/fortran/src/H5LTf90proto.h +++ b/hl/fortran/src/H5LTf90proto.h @@ -23,8 +23,8 @@ #include <string.h> -HDF5_HL_F90CSTUBDLL char* HD5f2cstring (_fcd fdesc, int len); -HDF5_HL_F90CSTUBDLL 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); /* diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt index 280089a..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 ( diff --git a/release_docs/USING_Windows.txt b/release_docs/USING_Windows.txt index 03dbc67..4e78c68 100644 --- a/release_docs/USING_Windows.txt +++ b/release_docs/USING_Windows.txt @@ -67,26 +67,61 @@ Preconditions: Szip compression feature inside HDF5 is enabled by default. - 8. Set up path for libraries and headers + 8. Define the following environment variables: + + HDF5_EXT_ZLIB + HDF5_EXT_SZIP + + In this section, Zlib and Szip compression packages are assumed to be + used. Please read Section V as well as this section if you do not want + to use compression feature inside HDF5. + + To define these environment variables: + + Click "Start", click "Control Panel", and then double-click "System". + On the "Advanced" tab, click "Environment Variables". + + If you are logged on as administrator to the local computer AND want to + let all other users use these two environment variables, click "New" + under "System Variables" box; otherwise, click "New" under "User + Variables" box. + + In the New Variable window, set "Variable name" as HDF5_EXT_ZLIB and + "Variable value" as zlib1.lib, then click OK. + + Similarly, you can set: + + HDF5_EXT_SZIP environment variable as szip.lib + + Notes: + + a. You will have to close and reopen running programs for the new + environment variable settings to take effect. + + b. c:\zlib\zlib1.dll and c:\szip\dll\szip.dll should be copied + into a location that the application can find. + + 9. Set up path for libraries and headers Invoke Microsoft Visual Studio and go to "Tools" and select "Options", find "Projects", and then "VC++ Directories". - 8.1 If you are building on 64-bit Windows, find the "Platform" dropdown + 9.1 If you are building on 64-bit Windows, find the "Platform" dropdown and select "x64". - 8.2 Find the box "Show directories for", choose "Include files", if you + 9.2 Find the box "Show directories for", choose "Include files", if you can not find your HDF5 header path (for example, c:\MyHDFstuff\include) from the directory list, add the header path (c:\MyHDFstuff\include) to the included directories. - 8.3 Find the box "Show directories for", choose "Library files". If you + 9.3 Find the box "Show directories for", choose "Library files". If you cannot find your HDF5 library path (for example, - c:\MyHDFstuff\dll) from the directory list, add the library - path (c:\MyHDFstuff\dll) to the library directories. + c:\MyHDFstuff\dll for dynamic-shared and c:\MyHDFstuff\lib for static) + from the directory list, add the library + path (c:\MyHDFstuff\dll or c:\MyHDFstuff\lib) to the library directories. - 8.4 If building Fortran applications, you will also need to setup the path + 9.4 If building Fortran applications, you will also need to setup the path for the Intel Fortran compiler. Please see Section VI. Notes: @@ -98,6 +133,8 @@ Notes: 2. For Fortran users, Intel Fortran Compiler 10.1 is currently supported -- please see Section VI. Intel Compiler 11.1 can be used but the project files must be upgraded within the Visual Studio IDE. + + 3. The szip and zlib dlls must be in the PATH for using the tools (including static). ======================================================================== @@ -125,8 +162,35 @@ Notes: HDF5 tool export library for DLL: release version - 2. Examples (Not included in the binary distribution) - + 2. Examples (Included in the binary distribution as a zip file) + + Unpack the examples, hdf5-examples.zip, into your "hdf5" folder + (c:\MyHDFstuff\hdf5). + The resulting structure under this folder should be: + c++ + c++/examples + examples + fortran + fortran/examples + hl + hl/c++ + hl/c++/examples + hl/examples + hl/fortran + hl/fortran/examples + windows + windows/c++ + windows/c++/examples + windows/examples + windows/fortran + windows/fortran/examples + windows/hl + windows/hl/examples + windows/hl/fortran + windows/hl/fortran/examples + hdf5build_examples.bat + InstallExamples.bat + HDF5 examples: Simple HDF5 C/C++/Fortran and High level C/Fortran examples @@ -156,24 +220,18 @@ To build and test HDF5 C examples: Solution" option. Then open the solution - c:\MyHDFstuff\hdf5\windows\examples\allexamples\allexamples.sln. + c:\MyHDFstuff\hdf5examples\windows\examples\allexamples\allexamples.sln. 2. Select "Build", and "Configuration Manager". - 2.1 To build debug versions of C examples: - - In "Active Solution Configuration", select "Debug". Select "Close". - Select "Build" -> "Build Solution" or "Rebuild Solution" to build - debug version of project "allexamples". - - 2.2 To build release versions of C examples. + To build release versions of C examples. In "Active Solution Configuration", select "Release". Select "Close". Select "Build" -> "Build Solution" or "Rebuild Solution" to build release version of project "allexamples". - When the debug and release build is done, there should be the following - subdirectories in c:\MyHDFstuff\hdf5\examples\ + When the release build is done, there should be the following + subdirectories in c:\MyHDFstuff\hdf5examples\examples\ attributetest attributetestdll @@ -193,26 +251,21 @@ To build and test HDF5 C examples: writetestdll 3. Invoke a command prompt window and run the batch file InstallExamples.bat - which resides in the top level directory (c:\MyHDFstuff\hdf5). This file - creates 4 new directories, examplesREL, examplesRELDLL, examplesDBG, and - examplesDBGDLL, in the c:\MyHDFstuff\hdf5\examples directory and places - all the executables in it. Both the release and debug versions of the - examples should be built before this step is done. + which resides in the top level directory (c:\MyHDFstuff\hdf5examples). This file + creates new directories, examplesREL, examplesRELDLL in the + c:\MyHDFstuff\hdf5examples\examples directory and places + all the executables in it. 4. We provide a batch file named testExamples.bat and an expected examples tests output file named testExamples_exp_output.txt in c:\MyHDFstuff\hdf5\examples directory for you to test HDF5 C examples. - testExamples.bat batch file has 4 options: + testExamples.bat batch file has options: testExamples release -- for release version testExamples release dll -- for release DLL version - testExamples debug -- for debug version - - testExamples debug dll -- for debug DLL version - Invoke a command prompt and run testExamples.bat with appropriate options. You should get "All HDF5 C examples tests passed." when the C examples are built successfully. Otherwise, the difference between the expected @@ -225,24 +278,18 @@ To build and test HDF5 C++ examples: Solution" option. Then open the solution - c:\MyHDFstuff\hdf5\windows\examples\allexamples\allcppexamples.sln. + c:\MyHDFstuff\hdf5examples\windows\examples\allexamples\allcppexamples.sln. 2. Select "Build", and "Configuration Manager". - 2.1 To build debug versions of C examples: - - In "Active Solution Configuration", select "Debug". Select "Close". - Select "Build" -> "Build Solution" or "Rebuild Solution" to build - debug version of project "allcppexamples". - - 2.2 To build release versions of C examples. + To build release versions of C examples. In "Active Solution Configuration", select "Release". Select "Close". Select "Build" -> "Build Solution" or "Rebuild Solution" to build release version of project "allcppexamples". - When the debug build or release build is done, there should be the following - subdirectories in c:\MyHDFstuff\hdf5\c++\examples\ + When the release build is done, there should be the following + subdirectories in c:\MyHDFstuff\hdf5examples\c++\examples\ chunks chunksdll @@ -261,26 +308,21 @@ To build and test HDF5 C++ examples: 3. Invoke a command prompt window and run the batch file InstallcppExamples.bat which resides in the top level directory - (c:\MyHDFstuff\hdf5). This file creates 4 new directories, - cppexamplesREL, cppexamplesRELDLL, cppexamplesDBG, and cppexamplesDBGDLL, - in the c:\MyHDFstuff\c++\examples directory and places all the executables - in it. Both the release and debug versions of the examples should be - built before this step is done. + (c:\MyHDFstuff\hdf5examples). This file creates new directories, + cppexamplesREL, cppexamplesRELDLL in the + c:\MyHDFstuff\hdf5examples\c++\examples directory and places all + the executables in it. 4. We provide a batch file named testcppExamples.bat in - c:\MyHDFstuff\hdf5\c++\examples directory for you to test HDF5 C++ + c:\MyHDFstuff\hdf5examples\c++\examples directory for you to test HDF5 C++ examples. - testcppExamples.bat batch file has 4 options: + testcppExamples.bat batch file has options: testcppExamples release -- for release version testcppExamples release dll -- for release DLL version - testcppExamples debug -- for debug version - - testcppExamples debug dll -- for debug DLL version - Invoke a command prompt and run testcppExamples.bat with appropriate options. You should get "All HDF5 C++ examples tests passed." when the C++ examples are built successfully. Otherwise, the difference between @@ -294,23 +336,17 @@ To build and test HDF5 High Level C examples: Solution" option. Then open the solution - c:\MyHDFstuff\hdf5\windows\hl\examples\allhlcexamples\allhlcexamples.sln + c:\MyHDFstuff\hdf5examples\windows\hl\examples\allhlcexamples\allhlcexamples.sln 2. Select "Build", and "Configuration Manager". - 2.1 To build debug versions of C examples: - - In "Active Solution Configuration", select "Debug". Select "Close". - Select "Build" -> "Build Solution" or "Rebuild Solution" to build - debug version of project "allhlcexamples". - - 2.2 To build release versions of C examples. + To build release versions of C examples. In "Active Solution Configuration", select "Release". Select "Close". Select "Build" -> "Build Solution" or "Rebuild Solution" to build release version of project "allhlcexamples". - When the debug and release build is done, binaries will be built in the + When the release build is done, binaries will be built in the following subdirectories of c:\MyHDFstuff\hdf5\examples\ ex_image[1-2](dll) @@ -320,18 +356,16 @@ To build and test HDF5 High Level C examples: ptExample[FL+VL](dll) 3. Invoke a command prompt and run the batch file Install_hlcexamples.bat - which resides in the top level directory (c:\MyHDFstuff\hdf5). This file - creates 4 new directories, HLCexamplesRELEASE, HLCexamplesRELEASEDLL, - HLCexamplesDEBUG, and HLCexamplesDEBUGDLL, in the - c:\MyHDFstuff\hdf5\hl\examples directory and places all the executables in - it. Both the release and debug versions of the examples should be built - before this step is done. + which resides in the top level directory (c:\MyHDFstuff\hdf5examples). This file + creates new directories, HLCexamplesRELEASE, HLCexamplesRELEASEDLL in the + c:\MyHDFstuff\hdf5examples\hl\examples directory and places all the executables in + it. 4. We provide a batch file named test_hl_cexamples.bat in - c:\MyHDFstuff\hdf5\hl\examples directory for you to test HDF5 high level C + c:\MyHDFstuff\hdf5examples\hl\examples directory for you to test HDF5 high level C examples. - test_hl_cexamples.bat batch file has 4 options: + test_hl_cexamples.bat batch file has options: Options purpose @@ -339,10 +373,6 @@ To build and test HDF5 High Level C examples: test_hl_cexamples release dll -- for release DLL version - test_hl_cexamples debug -- for debug version - - test_hl_cexamples debug dll -- for debug DLL version - Invoke a command prompt window and run test_hl_cexamples with appropriate options. @@ -597,7 +627,7 @@ using the Visual C++ Development Environment. 1.1 Project name and location issues: It is recommended that you use the given directory structure for building - HDF5. However, it is possible to create your own structure. If you must + HDF5 Examples. However, it is possible to create your own structure. If you must install all.sln and all.vcproj in another directory, relative to hdf5 directory, you will be asked to locate the sub-project files, when you open the project all.sln. diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 9a2dd88..8fb93b5 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -297,9 +297,11 @@ SET (H5_TESTS ) FOREACH (test ${H5_TESTS}) - ADD_H5_TEST(${test}) + ADD_H5_TEST(${test}) + SET_TESTS_PROPERTIES(${test} PROPERTIES DEPENDS h5test-clear-objects) ENDFOREACH (test ${H5_TESTS}) +SET_TESTS_PROPERTIES(flush2 PROPERTIES DEPENDS flush1) ############################################################################## ############################################################################## @@ -313,6 +315,7 @@ H5_NAMING (cache ${LIB_TYPE}) TARGET_LINK_LIBRARIES (cache ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) ADD_TEST (NAME cache COMMAND $<TARGET_FILE:cache>) +SET_TESTS_PROPERTIES(cache PROPERTIES DEPENDS h5test-clear-objects) #-- Adding test for cache_api ADD_EXECUTABLE (cache_api ${HDF5_TEST_SOURCE_DIR}/cache_api.c ${HDF5_TEST_SOURCE_DIR}/cache_common.c) diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt index bc3ccd1..2f39282 100644 --- a/tools/h5copy/CMakeLists.txt +++ b/tools/h5copy/CMakeLists.txt @@ -94,10 +94,15 @@ IF (BUILD_TESTING) NAME H5COPY-DIFF_${testname} COMMAND $<TARGET_FILE:h5diff> -q ./testfiles/${testfile}.h5 ./testfiles/${testfile}.out.h5 ${srcname} ${dstname} ) + SET_TESTS_PROPERTIES(H5COPY-DIFF_${testname} PROPERTIES DEPENDS H5COPY-${testname}) IF (${resultcode} STREQUAL "1") SET_TESTS_PROPERTIES (H5COPY-DIFF_${testname} PROPERTIES WILL_FAIL "true") ENDIF (${resultcode} STREQUAL "1") ENDIF (NOT ${resultcode} STREQUAL "2") + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5COPY-${testname} PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5COPY-DIFF_${testname}") ENDMACRO (ADD_H5_TEST testname resultcode testfile vparam srcname dstname) MACRO (ADD_H5LS_TEST file filetest) @@ -113,6 +118,10 @@ IF (BUILD_TESTING) -D "TEST_MASK=true" -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5COPY-H5LS_${file}-${filetest} PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5COPY-H5LS_${file}-${filetest}") ENDMACRO (ADD_H5LS_TEST file filetest) MACRO (ADD_H5_CMP_TEST testname resultcode testfile vparam srcname dstname) @@ -128,6 +137,10 @@ IF (BUILD_TESTING) -D "TEST_MASK=true" -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5COPY-CMP-${testname} PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5COPY-CMP-${testname}") ENDMACRO (ADD_H5_CMP_TEST testname resultcode testfile vparam srcname dstname) ############################################################################## @@ -159,6 +172,10 @@ IF (BUILD_TESTING) ./testfiles/${HDF_EXT_SRC_FILE}.out.out ./testfiles/${HDF_EXT_SRC_FILE}.out.out.err ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5COPY-clearall-objects PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5COPY-clearall-objects") # "Test copying various forms of datasets" ADD_H5_TEST (simple 0 ${HDF_FILE1} v simple simple) @@ -210,6 +227,10 @@ IF (BUILD_TESTING) ./testfiles/${HDF_FILE2}.out.out ./testfiles/${HDF_FILE2}.out.out.err ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5COPY-clear-refs PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5COPY-clear-refs") # "Test copying object and region references" ADD_H5_TEST (region_ref 2 ${HDF_FILE2} v / /COPY ref) @@ -228,6 +249,10 @@ IF (BUILD_TESTING) ./testfiles/${HDF_EXT_SRC_FILE}.out.out ./testfiles/${HDF_EXT_SRC_FILE}.out.out.err ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5COPY-clear-ext-links PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5COPY-clear-ext-links") # "Test copying external link directly without -f ext" ADD_H5_TEST (ext_link 2 ${HDF_EXT_SRC_FILE} v /group_ext/extlink_dset /copy1_dset) @@ -274,6 +299,10 @@ IF (BUILD_TESTING) ./testfiles/${HDF_FILE1}.out.out ./testfiles/${HDF_FILE1}.out.out.err ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5COPY-clear-misc PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5COPY-clear-misc") # "Test copying object into group which doesn't exist, without -p" ADD_H5_CMP_TEST (h5copy_misc1 1 ${HDF_FILE1} v /simple /g1/g2/simple) diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt index aabb899..3041171 100644 --- a/tools/h5diff/CMakeLists.txt +++ b/tools/h5diff/CMakeLists.txt @@ -282,6 +282,10 @@ IF (BUILD_TESTING) -D "TEST_APPEND=EXIT CODE:" -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5DIFF-${resultfile}") ENDMACRO (ADD_H5_TEST file) ############################################################################## @@ -605,6 +609,10 @@ IF (BUILD_TESTING) h5diff_90.out h5diff_90.out.err ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5DIFF-clearall-objects PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5DIFF-clearall-objects") # If using memchecker add tests without using scripts IF (HDF5_ENABLE_USING_MEMCHECKER) diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt index 0209c35..77f3763 100644 --- a/tools/h5dump/CMakeLists.txt +++ b/tools/h5dump/CMakeLists.txt @@ -417,6 +417,10 @@ IF (BUILD_TESTING) -D "TEST_REFERENCE=${resultfile}.ddl" -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5DUMP-${resultfile} PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5DUMP-${resultfile}") ENDMACRO (ADD_H5_TEST file) MACRO (ADD_H5_EXPORT_TEST resultfile targetfile resultcode) @@ -424,11 +428,16 @@ IF (BUILD_TESTING) NAME H5DUMP-output-${resultfile} COMMAND $<TARGET_FILE:h5dump> -d /Dataset1 -s 0 -R -y -o ${PROJECT_BINARY_DIR}/${resultfile}.txt ${PROJECT_BINARY_DIR}/${targetfile} ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5DUMP-output-${resultfile} PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") ADD_TEST ( NAME H5DUMP-output-cmp-${resultfile} COMMAND ${CMAKE_COMMAND} -E compare_files ${PROJECT_BINARY_DIR}/${resultfile}.txt ${PROJECT_BINARY_DIR}/${resultfile}.exp ) + SET_TESTS_PROPERTIES (H5DUMP-output-cmp-${resultfile} PROPERTIES DEPENDS H5DUMP-output-${resultfile}) + SET (last_test "H5DUMP-output-cmp-${resultfile}") ENDMACRO (ADD_H5_EXPORT_TEST file) MACRO (ADD_XML_SKIP_H5_TEST skipresultfile skipresultcode testtype) @@ -454,6 +463,10 @@ IF (BUILD_TESTING) -D "TEST_REFERENCE=${resultfile}.xml" -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5DUMP-XML-${resultfile} PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5DUMP-XML-${resultfile}") ENDMACRO (ADD_XML_H5_TEST file) # -------------------------------------------------------------------- @@ -701,6 +714,10 @@ IF (BUILD_TESTING) tvms.out tvms.out.err ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5DUMP-clearall-objects PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5DUMP-clearall-objects") # If using memchecker add tests without using scripts IF (HDF5_ENABLE_USING_MEMCHECKER) @@ -983,6 +1000,10 @@ IF (BUILD_TESTING) out3.h5 ) ENDIF (NOT HDF5_NOCLEANUP) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5DUMP-clear-objects PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5DUMP-clear-objects") # test for dataset region references ADD_H5_TEST (tdatareg 0 tdatareg.h5) @@ -1027,6 +1048,10 @@ IF (BUILD_TESTING) tpackedbits2.out tpackedbits2.out.err ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5DUMP_PACKED_BITS-clearall-objects PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5DUMP_PACKED_BITS-clearall-objects") ADD_H5_TEST (tpackedbits 0 -d /dset1 -M 0,2 tdset.h5) ADD_H5_TEST (tpackedbits2 0 -d /dset1 -M 0,2,2,1 tdset.h5) ENDIF (HDF5_USE_H5DUMP_PACKED_BITS) @@ -1165,6 +1190,10 @@ IF (BUILD_TESTING) tvlstr.h5.out tvlstr.h5.out.err ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5DUMP-XML-clearall-objects PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5DUMP-XML-clearall-objects") ########## test XML diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt index 039af8e..8eea367 100644 --- a/tools/h5import/CMakeLists.txt +++ b/tools/h5import/CMakeLists.txt @@ -59,6 +59,7 @@ IF (BUILD_TESTING) ) ADD_TEST (NAME h5importtest COMMAND $<TARGET_FILE:h5importtest>) + SET_TESTS_PROPERTIES (h5importtest PROPERTIES DEPENDS H5IMPORT-clear-objects) ENDIF (BUILD_TESTING) ############################################################################## diff --git a/tools/h5ls/CMakeLists.txt b/tools/h5ls/CMakeLists.txt index 7db6c7f..431a693 100644 --- a/tools/h5ls/CMakeLists.txt +++ b/tools/h5ls/CMakeLists.txt @@ -147,6 +147,10 @@ IF (BUILD_TESTING) -D "TEST_REFERENCE=${resultfile}.ls" -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5LS-${resultfile} PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5LS-${resultfile}") ENDMACRO (ADD_H5_TEST file) ############################################################################## @@ -267,6 +271,10 @@ IF (BUILD_TESTING) tvldtypes2be.out tvldtypes2be.out.err ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5LS-clearall-objects PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5LS-clearall-objects") # If using memchecker add tests without using scripts IF (HDF5_ENABLE_USING_MEMCHECKER) diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt index f24c7be..92933d4 100644 --- a/tools/h5repack/CMakeLists.txt +++ b/tools/h5repack/CMakeLists.txt @@ -59,6 +59,7 @@ IF (BUILD_TESTING) TARGET_LINK_LIBRARIES (h5repacktest ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) ADD_TEST (NAME h5repacktest COMMAND $<TARGET_FILE:h5repacktest>) + SET_TESTS_PROPERTIES (h5repacktest PROPERTIES DEPENDS testh5repack_detect_szip) IF (HDF5_TEST_VFD) @@ -177,10 +178,15 @@ IF (BUILD_TESTING) NAME H5REPACK-${testname} COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out.${testfile} ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5REPACK-${testname} PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") ADD_TEST ( NAME H5REPACK-DIFF_${testname} COMMAND $<TARGET_FILE:h5diff> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out.${testfile} ) + SET_TESTS_PROPERTIES (H5REPACK-DIFF_${testname} PROPERTIES DEPENDS H5REPACK-${testname}) + SET (last_test "H5REPACK-DIFF_${testname}") ENDIF (${testtype} STREQUAL "SKIP") ENDMACRO (ADD_H5_TEST) @@ -203,6 +209,10 @@ IF (BUILD_TESTING) -D "TEST_REFERENCE=testfiles/${resultfile}.ddl" -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5REPACK-${testname} PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5REPACK-${testname}") ENDIF (${testtype} STREQUAL "SKIP") ENDMACRO (ADD_H5_CMP_TEST) @@ -226,6 +236,8 @@ IF (BUILD_TESTING) -D "TEST_REFERENCE=${testfilter}" -P "${HDF5_RESOURCES_DIR}/grepTest.cmake" ) + SET_TESTS_PROPERTIES (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES DEPENDS H5REPACK-${testname}) + SET (last_test "H5REPACK_VERIFY_LAYOUT-${testname}") ELSE (${resultcode} STREQUAL "0") IF (${testfilter} STREQUAL "CHUNKED") SET (nottestfilter "(CONTIGUOUS|COMPACT)") @@ -248,6 +260,8 @@ IF (BUILD_TESTING) -D "TEST_REFERENCE=${testfilter}" -P "${HDF5_RESOURCES_DIR}/grepTest.cmake" ) + SET_TESTS_PROPERTIES (H5REPACK_VERIFY_LAYOUT_ALL-${testname} PROPERTIES DEPENDS H5REPACK-${testname}) + SET (last_test "H5REPACK_VERIFY_LAYOUT-${testname}") ENDIF (${resultcode} STREQUAL "0") ENDIF (${testtype} STREQUAL "SKIP") ENDMACRO (ADD_H5_VERIFY_TEST) @@ -323,6 +337,10 @@ IF (BUILD_TESTING) h5repack_ub_out.h5 h5repack_attr_refs_out.h5 ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5REPACK-clearall-objects PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5REPACK-clearall-objects") # -------------------------------------------------------------------- # test file names diff --git a/tools/h5stat/CMakeLists.txt b/tools/h5stat/CMakeLists.txt index 554b219..8dceae8 100644 --- a/tools/h5stat/CMakeLists.txt +++ b/tools/h5stat/CMakeLists.txt @@ -99,6 +99,10 @@ IF (BUILD_TESTING) -D "TEST_REFERENCE=${resultfile}.ddl" -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5STAT-${resultfile} PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5STAT-${resultfile}") ENDMACRO (ADD_H5_TEST file) ############################################################################## @@ -141,6 +145,10 @@ IF (BUILD_TESTING) h5stat_newgrat-UA.out h5stat_newgrat-UA.out.err ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5STAT-clearall-objects PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5STAT-clearall-objects") # If using memchecker add tests without using scripts IF (HDF5_ENABLE_USING_MEMCHECKER) diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt index e94d9dc..6694458 100644 --- a/tools/misc/CMakeLists.txt +++ b/tools/misc/CMakeLists.txt @@ -144,6 +144,7 @@ IF (BUILD_TESTING) COMMAND $<TARGET_FILE:h5mkgrp> ${PROJECT_BINARY_DIR}/../testfiles/${resultfile}.h5 ${ARGN} ) ENDIF (NOT ${resultoption} STREQUAL " ") + SET_TESTS_PROPERTIES (H5MKGRP-${resultfile}${resultoption} PROPERTIES DEPENDS H5MKGRP-clear-${resultfile}${resultoption}) ADD_TEST ( NAME H5MKGRP-H5LS-${resultfile}${resultoption} COMMAND "${CMAKE_COMMAND}" @@ -156,6 +157,7 @@ IF (BUILD_TESTING) -D "TEST_REFERENCE=${resultfile}.ls" -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) + SET_TESTS_PROPERTIES (H5MKGRP-H5LS-${resultfile}${resultoption} PROPERTIES DEPENDS H5MKGRP-${resultfile}${resultoption}) ENDMACRO (ADD_H5_TEST resultfile resultcode resultoption) MACRO (ADD_H5_CMP resultfile resultcode) @@ -187,6 +189,7 @@ IF (BUILD_TESTING) ) # repartition family member size to 20,000 bytes. ADD_TEST (NAME h5repart_20K COMMAND $<TARGET_FILE:h5repart> -m 20000 family_file%05d.h5 fst_family%05d.h5) + SET_TESTS_PROPERTIES (h5repart_20K PROPERTIES DEPENDS h5repart_20K-clear-objects) # Remove any output file left over from previous test run ADD_TEST ( @@ -200,6 +203,7 @@ IF (BUILD_TESTING) ) # repartition family member size to 5 KB. ADD_TEST (NAME h5repart_5K COMMAND $<TARGET_FILE:h5repart> -m 5k family_file%05d.h5 scd_family%05d.h5) + SET_TESTS_PROPERTIES (h5repart_5K PROPERTIES DEPENDS h5repart_5K-clear-objects) # Remove any output file left over from previous test run ADD_TEST ( @@ -210,9 +214,11 @@ IF (BUILD_TESTING) ) # convert family file to sec2 file of 20,000 bytes ADD_TEST (NAME h5repart_sec2 COMMAND $<TARGET_FILE:h5repart> -m 20000 -family_to_sec2 family_file%05d.h5 family_to_sec2.h5) + SET_TESTS_PROPERTIES (h5repart_sec2 PROPERTIES DEPENDS h5repart_sec2-clear-objects) # test the output files repartitioned above. ADD_TEST (NAME h5repart_test COMMAND $<TARGET_FILE:h5repart_test>) + SET_TESTS_PROPERTIES (h5repart_test PROPERTIES DEPENDS h5repart_sec2 h5repart_5K h5repart_20K) SET (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5repart_test diff --git a/windows/InstallExamples.bat b/windows/InstallExamples.bat index d0bf4dd..5316f5d 100755 --- a/windows/InstallExamples.bat +++ b/windows/InstallExamples.bat @@ -23,96 +23,76 @@ cd examples mkdir examplesREL
mkdir examplesRELDLL
-mkdir examplesDBG
-mkdir examplesDBGDLL
cd attributetest
-copy debug\attributetest.exe ..\examplesDBG\
copy release\attributetest.exe ..\examplesREL\
cd ..
cd attributetestdll
-copy debug\attributetestdll.exe ..\examplesDBGDLL\
-copy release\attributetestdll.exe ..\examplesRELDLL\
+opy release\attributetestdll.exe ..\examplesRELDLL\
cd ..
cd chunkread
-copy debug\chunkread.exe ..\examplesDBG\
copy release\chunkread.exe ..\examplesREL\
cd ..
cd chunkreaddll
-copy debug\chunkreaddll.exe ..\examplesDBGDLL\
copy release\chunkreaddll.exe ..\examplesRELDLL\
cd ..
cd compoundtest
-copy debug\compoundtest.exe ..\examplesDBG\
copy release\compoundtest.exe ..\examplesREL\
cd ..
cd compoundtestdll
-copy debug\compoundtestdll.exe ..\examplesDBGDLL\
copy release\compoundtestdll.exe ..\examplesRELDLL\
cd ..
cd extendwritetest
-copy debug\extendwritetest.exe ..\examplesDBG\
copy release\extendwritetest.exe ..\examplesREL\
cd ..
cd extendwritetestdll
-copy debug\extendwritetestdll.exe ..\examplesDBGDLL\
copy release\extendwritetestdll.exe ..\examplesRELDLL\
cd ..
cd grouptest
-copy debug\grouptest.exe ..\examplesDBG\
copy release\grouptest.exe ..\examplesREL\
cd ..
cd grouptestdll
-copy debug\grouptestdll.exe ..\examplesDBGDLL\
copy release\grouptestdll.exe ..\examplesRELDLL\
cd ..
cd intermgrouptest
-copy debug\intermgrouptest.exe ..\examplesDBG\
copy release\intermgrouptest.exe ..\examplesREL\
cd ..
cd intermgrouptestdll
-copy debug\intermgrouptestdll.exe ..\examplesDBGDLL\
copy release\intermgrouptestdll.exe ..\examplesRELDLL\
cd ..
cd readtest
-copy debug\readtest.exe ..\examplesDBG\
copy release\readtest.exe ..\examplesREL\
cd ..
cd readtestdll
-copy debug\readtestdll.exe ..\examplesDBGDLL\
copy release\readtestdll.exe ..\examplesRELDLL\
cd ..
cd selectest
-copy debug\selectest.exe ..\examplesDBG\
copy release\selectest.exe ..\examplesREL\
cd ..
cd selectestdll
-copy debug\selectestdll.exe ..\examplesDBGDLL\
copy release\selectestdll.exe ..\examplesRELDLL\
cd ..
cd writetest
-copy debug\writetest.exe ..\examplesDBG\
copy release\writetest.exe ..\examplesREL\
cd ..
cd writetestdll
-copy debug\writetestdll.exe ..\examplesDBGDLL\
copy release\writetestdll.exe ..\examplesRELDLL\
cd ..
diff --git a/windows/InstallcppExamples.BAT b/windows/InstallcppExamples.BAT index 14317ab..fb0f800 100755 --- a/windows/InstallcppExamples.BAT +++ b/windows/InstallcppExamples.BAT @@ -23,76 +23,60 @@ cd c++\examples mkdir cppexamplesREL
mkdir cppexamplesRELDLL
-mkdir cppexamplesDBG
-mkdir cppexamplesDBGDLL
cd chunkstest
-copy debug\chunkstest.exe ..\cppexamplesDBG\
copy release\chunkstest.exe ..\cppexamplesREL\
cd ..
cd chunkstestdll
-copy debug\chunkstestdll.exe ..\cppexamplesDBGDLL\
copy release\chunkstestdll.exe ..\cppexamplesRELDLL\
cd ..
cd compoundtest
-copy debug\compoundtest.exe ..\cppexamplesDBG\
copy release\compoundtest.exe ..\cppexamplesREL\
cd ..
cd compoundtestdll
-copy debug\compoundtestdll.exe ..\cppexamplesDBGDLL\
copy release\compoundtestdll.exe ..\cppexamplesRELDLL\
cd ..
cd createtest
-copy debug\createtest.exe ..\cppexamplesDBG\
copy release\createtest.exe ..\cppexamplesREL\
cd ..
cd createtestdll
-copy debug\createtestdll.exe ..\cppexamplesDBGDLL\
copy release\createtestdll.exe ..\cppexamplesRELDLL\
cd ..
cd extend_dstest
-copy debug\extend_dstest.exe ..\cppexamplesDBG\
copy release\extend_dstest.exe ..\cppexamplesREL\
cd ..
cd extend_dstestdll
-copy debug\extend_dstestdll.exe ..\cppexamplesDBGDLL\
copy release\extend_dstestdll.exe ..\cppexamplesRELDLL\
cd ..
cd h5grouptest
-copy debug\h5grouptest.exe ..\cppexamplesDBG\
copy release\h5grouptest.exe ..\cppexamplesREL\
cd ..
cd h5grouptestdll
-copy debug\h5grouptestdll.exe ..\cppexamplesDBGDLL\
copy release\h5grouptestdll.exe ..\cppexamplesRELDLL\
cd ..
cd readdatatest
-copy debug\readdatatest.exe ..\cppexamplesDBG\
copy release\readdatatest.exe ..\cppexamplesREL\
cd ..
cd readdatatestdll
-copy debug\readdatatestdll.exe ..\cppexamplesDBGDLL\
copy release\readdatatestdll.exe ..\cppexamplesRELDLL\
cd ..
cd writedatatest
-copy debug\writedatatest.exe ..\cppexamplesDBG\
copy release\writedatatest.exe ..\cppexamplesREL\
cd ..
cd writedatatestdll
-copy debug\writedatatestdll.exe ..\cppexamplesDBGDLL\
copy release\writedatatestdll.exe ..\cppexamplesRELDLL\
cd ..
diff --git a/windows/Installf90Examples.BAT b/windows/Installf90Examples.BAT index acde3a7..535cec1 100755 --- a/windows/Installf90Examples.BAT +++ b/windows/Installf90Examples.BAT @@ -24,146 +24,116 @@ cd fortran\examples mkdir f90examplesREL
mkdir f90examplesRELDLL
-mkdir f90examplesDBG
-mkdir f90examplesDBGDLL
cd attreexampletest
-copy debug\attreexampletest.exe ..\f90examplesDBG\
copy release\attreexampletest.exe ..\f90examplesREL\
cd ..
cd attreexampletestdll
-copy debug\attreexampletestdll.exe ..\f90examplesDBGDLL\
copy release\attreexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd compoundtest
-copy debug\compoundtest.exe ..\f90examplesDBG\
copy release\compoundtest.exe ..\f90examplesREL\
cd ..
cd compoundtestdll
-copy debug\compoundtestdll.exe ..\f90examplesDBGDLL\
copy release\compoundtestdll.exe ..\f90examplesRELDLL\
cd ..
cd dsetexampletest
-copy debug\dsetexampletest.exe ..\f90examplesDBG\
copy release\dsetexampletest.exe ..\f90examplesREL\
cd ..
cd dsetexampletestdll
-copy debug\dsetexampletestdll.exe ..\f90examplesDBGDLL\
copy release\dsetexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd fileexampletest
-copy debug\fileexampletest.exe ..\f90examplesDBG\
copy release\fileexampletest.exe ..\f90examplesREL\
cd ..
cd fileexampletestdll
-copy debug\fileexampletestdll.exe ..\f90examplesDBGDLL\
copy release\fileexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd groupexampletest
-copy debug\groupexampletest.exe ..\f90examplesDBG\
copy release\groupexampletest.exe ..\f90examplesREL\
cd ..
cd groupexampletestdll
-copy debug\groupexampletestdll.exe ..\f90examplesDBGDLL\
copy release\groupexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd grpdsetexampletest
-copy debug\grpdsetexampletest.exe ..\f90examplesDBG\
copy release\grpdsetexampletest.exe ..\f90examplesREL\
cd ..
cd grpdsetexampletestdll
-copy debug\grpdsetexampletestdll.exe ..\f90examplesDBGDLL\
copy release\grpdsetexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd grpittest
-copy debug\grpittest.exe ..\f90examplesDBG\
copy release\grpittest.exe ..\f90examplesREL\
cd ..
cd grpittestdll
-copy debug\grpittestdll.exe ..\f90examplesDBGDLL\
copy release\grpittestdll.exe ..\f90examplesRELDLL\
cd ..
cd grpsexampletest
-copy debug\grpsexampletest.exe ..\f90examplesDBG\
copy release\grpsexampletest.exe ..\f90examplesREL\
cd ..
cd grpsexampletestdll
-copy debug\grpsexampletestdll.exe ..\f90examplesDBGDLL\
copy release\grpsexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd hyperslabtest
-copy debug\hyperslabtest.exe ..\f90examplesDBG\
copy release\hyperslabtest.exe ..\f90examplesREL\
cd ..
cd hyperslabtestdll
-copy debug\hyperslabtestdll.exe ..\f90examplesDBGDLL\
copy release\hyperslabtestdll.exe ..\f90examplesRELDLL\
cd ..
cd mountexampletest
-copy debug\mountexampletest.exe ..\f90examplesDBG\
copy release\mountexampletest.exe ..\f90examplesREL\
cd ..
cd mountexampletestdll
-copy debug\mountexampletestdll.exe ..\f90examplesDBGDLL\
copy release\mountexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd refobjexampletest
-copy debug\refobjexampletest.exe ..\f90examplesDBG\
copy release\refobjexampletest.exe ..\f90examplesREL\
cd ..
cd refobjexampletestdll
-copy debug\refobjexampletestdll.exe ..\f90examplesDBGDLL\
copy release\refobjexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd refregexampletest
-copy debug\refregexampletest.exe ..\f90examplesDBG\
copy release\refregexampletest.exe ..\f90examplesREL\
cd ..
cd refregexampletestdll
-copy debug\refregexampletestdll.exe ..\f90examplesDBGDLL\
copy release\refregexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd rwdsetexampletest
-copy debug\rwdsetexampletest.exe ..\f90examplesDBG\
copy release\rwdsetexampletest.exe ..\f90examplesREL\
cd ..
cd rwdsetexampletestdll
-copy debug\rwdsetexampletestdll.exe ..\f90examplesDBGDLL\
copy release\rwdsetexampletestdll.exe ..\f90examplesRELDLL\
cd ..
cd selecteletest
-copy debug\selecteletest.exe ..\f90examplesDBG\
copy release\selecteletest.exe ..\f90examplesREL\
cd ..
cd selecteletestdll
-copy debug\selecteletestdll.exe ..\f90examplesDBGDLL\
copy release\selecteletestdll.exe ..\f90examplesRELDLL\
cd ..
diff --git a/windows/c++/test/checkcpptests.bat b/windows/c++/test/checkcpptests.bat index 285210d..828de6d 100644 --- a/windows/c++/test/checkcpptests.bat +++ b/windows/c++/test/checkcpptests.bat @@ -91,9 +91,8 @@ rem on it for sending parameters. --SJW 9/6/07 if "%nerrors%"=="0" (
echo.All C++ library tests passed.
) else (
- echo.** FAILED C++ Library tests.
+ echo.** FAILED C++ library tests.
)
-
+
popd
endlocal & exit /b %nerrors%
-
\ No newline at end of file diff --git a/windows/copy_hdf.bat b/windows/copy_hdf.bat index d6a368d..a6dc153 100755 --- a/windows/copy_hdf.bat +++ b/windows/copy_hdf.bat @@ -17,7 +17,7 @@ rem Purpose : Copy all Files in the following formats from Windows to rem approapriate directory: .bat .c .f90 .h .txt .js
rem :
rem Written By : Muqun Yang
-rem Last Update : November 17, 2007 by Scott Wegner
+rem Last Update : 2/18/08 by Scott Wegner
pushd %~dp0
diff --git a/windows/fortran/test/checkfortrantests.bat b/windows/fortran/test/checkfortrantests.bat index e4d7a4e..d806e7e 100644 --- a/windows/fortran/test/checkfortrantests.bat +++ b/windows/fortran/test/checkfortrantests.bat @@ -95,8 +95,8 @@ rem on it for sending parameters. --SJW 9/6/07 if "%nerrors%"=="0" (
echo.All Fortran library tests passed.
) else (
- echo.** FAILED Fortran Library tests.
+ echo.** FAILED Fortran library tests.
)
-
+
popd
endlocal & exit /b %nerrors%
diff --git a/windows/hdf5bt.BAT b/windows/hdf5bt.BAT index 0d61260..2f75286 100755 --- a/windows/hdf5bt.BAT +++ b/windows/hdf5bt.BAT @@ -19,9 +19,8 @@ rem This batch file takes the following options: rem . /vs9 Build HDF5 using Visual Studio 2008
rem . /fort Build and test HDF5 with Fortran libraries
rem . /useenv Build HDF5 using compiler settings defined
-rem . in the environment, rather than the IDE.
+rem . in the environment, rather than the IDE.
rem . /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
-rem . /ivf111 Build HDF5 Fortran using Intel Visual Fortran 11.1
rem . /log Log the build and test results in files defined by
rem . environment variables HDF5BUILD_LOG and
rem . HDF5CHECK_LOG
@@ -60,7 +59,6 @@ rem Print a help message echo. /vs9 Build HDF5 using Visual Studio 2008
echo. /fort Build and test HDF5 with Fortran libraries
echo. /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
- echo. /ivf111 Build HDF5 Fortran using Intel Visual Fortran 9.1
echo. /useenv Build HDF5 using compiler settings defined
echo. in the environment, rather than the IDE.
echo. /? Help information
@@ -72,12 +70,7 @@ rem Parse through the parameters sent to file, and set appropriate variables :parse_params
for %%a in (%*) do (
- if "%%a"=="/vs8" (
- rem Use Visual Studio 2005 to build
- call :help
- exit /b 1
-
- ) else if "%%a"=="/vs9" (
+ if "%%a"=="/vs9" (
rem Use Visual Studio 2008 to build
set hdf5_vs2008=true
@@ -85,19 +78,10 @@ rem Parse through the parameters sent to file, and set appropriate variables rem Enable Fortran
set hdf5_enablefortran=true
- ) else if "%%a"=="/ivf91" (
- rem Enable Fortran
- call :help
- exit /b 1
-
) else if "%%a"=="/ivf101" (
rem Enable Fortran
set hdf5_ivf101=true
- ) else if "%%a"=="/ivf111" (
- rem Enable Fortran
- set hdf5_ivf111=true
-
) else if "%%a"=="/useenv" (
rem Pass /useenv flag to devenv
set hdf5_useenv=true
@@ -139,10 +123,6 @@ rem Setup our environment set hdf5check_params=enableall
)
- if defined hdf5_ivf111 (
- set hdf5build_params=%hdf5build_params% /ivf111
- )
-
if defined hdf5_ivf101 (
set hdf5build_params=%hdf5build_params% /ivf101
)
diff --git a/windows/hdf5build.BAT b/windows/hdf5build.BAT index 2ac1ee5..651ecfb 100755 --- a/windows/hdf5build.BAT +++ b/windows/hdf5build.BAT @@ -19,7 +19,6 @@ rem This batch file takes the following options: rem . /vs9 Build HDF5 using Visual Studio 2008
rem . /fort Build HDF5 with Fortran libraries
rem . /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
-rem . /ivf111 Build HDF5 Fortran using Intel Visual Fortran 11.1
rem . /nodebug Note: Default is to build debug and release versions
rem . /useenv Build HDF5 using compiler settings defined
rem . in the environment, rather than the IDE.
@@ -56,9 +55,8 @@ rem Print a help message echo.Usage: %~nx0 [OPTION]
echo.
echo. /vs9 Build HDF5 using Visual Studio 2008
- echo. /fort Build HDF5 with Fortran libraries using the
+ echo. /fort Build HDF5 with Fortran libraries
echo. /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
- echo. /ivf111 Build HDF5 Fortran using Intel Visual Fortran 11.1
echo. /nodebug Note: Default is to build debug and release versions
echo. /useenv Build HDF5 using compiler settings defined
echo. in the environment, rather than the IDE.
@@ -71,31 +69,17 @@ rem Parse through the parameters sent to file, and set appropriate variables :parse_params
for %%a in (%*) do (
- if "%%a"=="/vs8" (
- rem Visual Studio 2005 no longer supported
- call :help
- exit /b 1
-
- ) else if "%%a"=="/vs9" (
- rem Use Visual Studio 2008
+ if "%%a"=="/vs9" (
+ rem Use Visual Studio .NET 2003
set hdf5_vs2008=true
) else if "%%a"=="/fort" (
rem Enable Fortran
set hdf5_enablefortran=true
- ) else if "%%a"=="/ivf111" (
- rem Enable Fortran
- set hdf5_ivf111=true
-
) else if "%%a"=="/ivf101" (
rem Enable Fortran
set hdf5_ivf101=true
-
- ) else if "%%a"=="/ivf91" (
- rem Enable Fortran
- call :help
- exit /b 1
) else if "%%a"=="/nodebug" (
rem Enable Fortran
@@ -128,11 +112,11 @@ rem Setup our environment echo.Setting up environment
- rem Make sure /vs8 and /vs9 weren't specified together
- if "%hdf5_vs2005%%hdf5_vs2008%"=="truetrue" (
- echo.Error: /vs8 and /vs9 should not be specified together.
- exit /b 1
- )
+ rem Make sure /vs10 and /vs9 weren't specified together
+ rem if "%hdf5_vs2010%%hdf5_vs2008%"=="truetrue" (
+ rem echo.Error: /vs10 and /vs9 should not be specified together.
+ rem exit /b 1
+ rem )
rem Figure out which solution file to use based on configuration
if defined hdf5_vs2008 (
@@ -143,7 +127,8 @@ rem Setup our environment ) else (
set hdf5_sln="%CD%\windows\proj\all\all.sln"
)
- )
+
+ )
rem Make sure PROCESSOR_ARCHITECURE is set to either x86 or AMD64
@@ -179,43 +164,24 @@ rem Setup our environment )
) else (
- if not defined hdf5_ivf101 (
- echo.with Intel Visual Fortran 11.1
+ echo.with Intel Visual Fortran 10.1
+
+ if defined ifort_compiler10 (
+ rem This sets the Intel Fortran 10.1 environment, as well as
+ rem setting the appropriate Visual Studio environment
- if defined ifort_compiler111 (
- rem This sets the Intel Fortran 11.1 environment, as well as
- rem setting the appropriate Visual Studio environment
-
- if %hdf5_platform%==Win32 (
- call "%ifort_compiler111%\Bin\IA32\ifortvars_ia32.bat"
- ) else (
- call "%ifort_compiler111%\Bin\intel64\ifortvars_intel64.bat"
- )
+ if %hdf5_platform%==Win32 (
+ call "%ifort_compiler10%\IA32\Bin\ifortvars.bat"
) else (
- echo.Error: Cannot setup Intel Fortran 11.1 environment. Please
- echo.make sure IFORT_COMPILER111 is defined in the environment.
- exit /b 1
+ call "%ifort_compiler10%\em64t\Bin\ifortvars.bat"
)
-
) else (
- echo.with Intel Visual Fortran 10.1
-
- if defined ifort_compiler10 (
- rem This sets the Intel Fortran 10.1 environment, as well as
- rem setting the appropriate Visual Studio environment
-
- if %hdf5_platform%==Win32 (
- call "%ifort_compiler10%\IA32\Bin\ifortvars.bat"
- ) else (
- call "%ifort_compiler10%\em64t\Bin\ifortvars.bat"
- )
- ) else (
- echo.Error: Cannot setup Intel Fortran 10.1 environment. Please
- echo.make sure IFORT_COMPILER10 is defined in the environment.
- exit /b 1
- )
- )
+ echo.Error: Cannot setup Intel Fortran 10.1 environment. Please
+ echo.make sure IFORT_COMPILER10 is defined in the environment.
+ exit /b 1
+ )
)
+
)
if defined hdf5_useenv (
@@ -301,13 +267,13 @@ rem This is where the magic happens )
rem Upgrade the project files if needed
- rem if defined hdf5_vs2008 (
- rem call :upgrade
- rem if not errorlevel 0 (
- rem echo.Error upgrading project files!
- rem goto error
- rem )
- rem )
+ if defined hdf5_vs2008 (
+ call :upgrade
+ if not errorlevel 0 (
+ echo.Error upgrading project files!
+ goto error
+ )
+ )
echo.Building HDF5 Libraries and Tools
echo.
diff --git a/windows/hdf5build_examples.BAT b/windows/hdf5build_examples.BAT index 3fea330..aa198b3 100644 --- a/windows/hdf5build_examples.BAT +++ b/windows/hdf5build_examples.BAT @@ -17,8 +17,8 @@ rem File Name: hdf5build_examples.bat rem This batch file is used to build HDF5 C/C++/Fortran examples.
rem This batch file takes the following options:
rem . /fort Build HDF5 examples, including Fortran
-rem . /nodebug Note: Default is to build debug and release versions
rem . /useenv Build HDF5 examples using compiler settings defined
+rem . /nodebug Note: Default is to build debug and release versions
rem . in the environment, rather than the IDE.
rem . /? Help information
rem By Scott Wegner
@@ -43,7 +43,7 @@ pushd %~dp0 set nerrors=0
if "%1"=="/?" goto help
-set blddebug=debug
+set blddebug=
set bldrelease=release
goto main
@@ -55,9 +55,7 @@ rem Print a help message echo.Usage: %~nx0 [OPTION]
echo.
echo. /fort Build HDF5 examples, including Fortran
- echo. /ivf101 Build HDF5 examples using Intel Visual Fortran 10.1
- echo. /ivf111 Build HDF5 examples using Intel Visual Fortran 11.1
- echo. /nodebug Note: Default is to build debug and release versions
+ echo. /debug Note: Default is to build release only versions
echo. /useenv Build HDF5 examples using compiler settings defined
echo. in the environment, rather than the IDE.
echo. /? Help information
@@ -73,17 +71,9 @@ rem Parse through the parameters sent to file, and set appropriate variables rem Enable Fortran
set hdf5_enablefortran=true
- ) else if "%%a"=="/ivf111" (
- rem Enable Fortran
- set hdf5_ivf111=true
-
- ) else if "%%a"=="/ivf101" (
- rem Enable Fortran
- set hdf5_ivf101=true
-
- ) else if "%%a"=="/nodebug" (
+ ) else if "%%a"=="/debug" (
rem Enable Fortran
- set blddebug=
+ set blddebug=debug
) else if "%%a"=="/useenv" (
rem Pass /useenv flag to devenv
@@ -106,7 +96,10 @@ rem Setup our environment rem Constants
echo.Setting up environment
-
+
+ rem Setup Visual Studio environment. By default, use the Visual Studio
+ rem 2008 environment.
+
rem Make sure PROCESSOR_ARCHITECURE is set to either x86 or AMD64
if "%PROCESSOR_ARCHITECTURE%"=="x86" (
set hdf5_platform=Win32
@@ -117,66 +110,44 @@ rem Setup our environment echo.either x86 or AMD64
exit /b 1
)
-
- rem Setup Visual Studio environment. By default, use the Visual Studio
- rem 2008 environment.
set ccflags=
- rem Currently VS2008 is the only compiler supported. 8
+ rem Currently VS2008 is the only compiler supported.
echo.Using Visual Studio 2008
if not defined hdf5_enablefortran (
- if defined vs90comntools (
- rem This sets the Visual Studio 2008 path and environment variables
- if %hdf5_platform%==Win32 (
- call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86
- ) else (
- call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86_amd64
- )
- ) else (
- echo.Error: Cannot setup Visual Studio 2009 environment. Please
+ if defined vs90comntools (
+ rem This sets the Visual Studio 2008 path and environment variables
+ if %hdf5_platform%==Win32 (
+ call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86
+ ) else (
+ call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86_amd64
+ )
+
+ ) else (
+ echo.Error: Cannot setup Visual Studio 2008 environment. Please
echo.make sure VS90COMNTOOLS is defined in the environment.
exit /b 1
)
) else (
- if not defined hdf5_ivf101 (
- echo.with Intel Visual Fortran 11.1
-
- if defined ifort_compiler111 (
- rem This sets the Intel Fortran 11.1 environment, as well as
- rem setting the appropriate Visual Studio environment
-
- if %hdf5_platform%==Win32 (
- call "%ifort_compiler111%\Bin\IA32\ifortvars_ia32.bat"
- ) else (
- call "%ifort_compiler111%\Bin\intel64\ifortvars_intel64.bat"
- )
- ) else (
- echo.Error: Cannot setup Intel Fortran 11.1 environment. Please
- echo.make sure IFORT_COMPILER111 is defined in the environment.
- exit /b 1
- )
-
- ) else (
- echo.with Intel Visual Fortran 10.1
-
- if defined ifort_compiler10 (
- rem This sets the Intel Fortran 10.1 environment, as well as
- rem setting the appropriate Visual Studio environment
-
- if %hdf5_platform%==Win32 (
- call "%ifort_compiler10%\IA32\Bin\ifortvars.bat"
- ) else (
- call "%ifort_compiler10%\em64t\Bin\ifortvars.bat"
- )
- ) else (
- echo.Error: Cannot setup Intel Fortran 10.1 environment. Please
- echo.make sure IFORT_COMPILER10 is defined in the environment.
- exit /b 1
- )
- )
+ echo.with Intel Visual Fortran 10.1
+
+ if defined ifort_compiler10 (
+ rem This sets the Intel Fortran 10.1 environment, as well as
+ rem setting the appropriate Visual Studio environment
+
+ if %hdf5_platform%==Win32 (
+ call "%ifort_compiler10%\IA32\Bin\ifortvars.bat"
+ ) else (
+ call "%ifort_compiler10%\em64t\Bin\ifortvars.bat"
+ )
+ ) else (
+ echo.Error: Cannot setup Intel Fortran 10.1 environment. Please
+ echo.make sure IFORT_COMPILER10 is defined in the environment.
+ exit /b 1
+ )
)
rem Setup variables for our SLN files
diff --git a/windows/hl/c++/test/checkhlcpptests.bat b/windows/hl/c++/test/checkhlcpptests.bat index db3f329..aaa8fe2 100644 --- a/windows/hl/c++/test/checkhlcpptests.bat +++ b/windows/hl/c++/test/checkhlcpptests.bat @@ -96,3 +96,4 @@ rem on it for sending parameters. --SJW 9/6/07 popd
endlocal & exit /b %nerrors%
+
\ No newline at end of file diff --git a/windows/hl/fortran/test/checkhlfortrantests.bat b/windows/hl/fortran/test/checkhlfortrantests.bat index 0710625..28d4822 100644 --- a/windows/hl/fortran/test/checkhlfortrantests.bat +++ b/windows/hl/fortran/test/checkhlfortrantests.bat @@ -98,3 +98,4 @@ rem on it for sending parameters. --SJW 9/6/07 popd
endlocal & exit /b %nerrors%
+
\ No newline at end of file diff --git a/windows/install_hlcexamples.BAT b/windows/install_hlcexamples.BAT index 7644ed0..043b7ee 100755 --- a/windows/install_hlcexamples.BAT +++ b/windows/install_hlcexamples.BAT @@ -30,8 +30,6 @@ rem Simply create the needed directories :makedirs
mkdir %exdir%\HLCexamplesRELEASE
mkdir %exdir%\HLCexamplesRELEASEDLL
- mkdir %exdir%\HLCexamplesDEBUG
- mkdir %exdir%\HLCexamplesDEBUGDLL
exit /b
rem This function actally copies the file over, first making sure it exists. If not, we increment nerrors
@@ -61,7 +59,7 @@ rem %2 - destination to copy to call :makedirs
rem copy the files
- for %%a in (DEBUG RELEASE) do (
+ for %%a in (RELEASE) do (
for %%b in (DLL static) do (
set ver=%%b
set ver=!ver:static=!
diff --git a/windows/install_hlf90examples.BAT b/windows/install_hlf90examples.BAT index f786cb6..779acea 100644 --- a/windows/install_hlf90examples.BAT +++ b/windows/install_hlf90examples.BAT @@ -23,16 +23,12 @@ cd hl/fortran/examples mkdir HLf90examplesRELEASE
mkdir HLf90examplesRELEASEDLL
-mkdir HLf90examplesDEBUG
-mkdir HLf90examplesDEBUGDLL
cd ex_lite
-copy debug\ex_lite.exe ..\HLf90examplesDEBUG\
copy release\ex_lite.exe ..\HLf90examplesRELEASE\
cd ..
cd ex_litedll
-copy debug\ex_litedll.exe ..\HLf90examplesDEBUGDLL\
copy release\ex_litedll.exe ..\HLf90examplesRELEASEDLL\
cd ..
diff --git a/windows/perform/checkperformtests.bat b/windows/perform/checkperformtests.bat index 4d789d1..228dbe5 100644 --- a/windows/perform/checkperformtests.bat +++ b/windows/perform/checkperformtests.bat @@ -99,3 +99,4 @@ rem on it for sending parameters. --SJW 9/6/07 popd
endlocal & exit /b %nerrors%
+
\ No newline at end of file diff --git a/windows/proj/hdf5/hdf5.vcproj b/windows/proj/hdf5/hdf5.vcproj index 8a247ce..35f00b9 100644 --- a/windows/proj/hdf5/hdf5.vcproj +++ b/windows/proj/hdf5/hdf5.vcproj @@ -617,10 +617,14 @@ RelativePath="..\..\..\src\H5FDwindows.c"
>
</File>
- <File
- RelativePath="..\..\..\src\H5Ffake.c"
- >
- </File>
+ <File
+ RelativePath="..\..\..\src\H5Fefc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\H5Ffake.c"
+ >
+ </File>
<File
RelativePath="..\..\..\src\H5Fio.c"
>
diff --git a/windows/proj/hdf5dll/hdf5dll.vcproj b/windows/proj/hdf5dll/hdf5dll.vcproj index abf4c09..60afacd 100644 --- a/windows/proj/hdf5dll/hdf5dll.vcproj +++ b/windows/proj/hdf5dll/hdf5dll.vcproj @@ -704,6 +704,10 @@ RelativePath="..\..\..\src\H5FDwindows.c"
>
</File>
+ <File
+ RelativePath="..\..\..\src\H5Fefc.c"
+ >
+ </File>
<File
RelativePath="..\..\..\src\H5Ffake.c"
>
diff --git a/windows/test/efc/efc.vcproj b/windows/test/efc/efc.vcproj new file mode 100644 index 0000000..8668e64 --- /dev/null +++ b/windows/test/efc/efc.vcproj @@ -0,0 +1,435 @@ +<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="efc"
+ ProjectGUID="{FD8B058E-F53A-4197-B75E-849904E5AA79}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../test/efc/Release/efc.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\../../../test/efc/Release/efc.pch"
+ AssemblerListingLocation=".\../../../test/efc/Release/"
+ ObjectFile=".\../../../test/efc/Release/"
+ ProgramDataBaseFileName=".\../../../test/efc/Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ OutputFile="$(OutDir)\$(ProjectName).exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ IgnoreDefaultLibraryNames=""
+ ProgramDatabaseFile=".\../../../test/efc/Release/efc.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\../../../test/efc/Release/efc.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\../../../test/efc/Release/efc.pch"
+ AssemblerListingLocation=".\../../../test/efc/Release/"
+ ObjectFile=".\../../../test/efc/Release/"
+ ProgramDataBaseFileName=".\../../../test/efc/Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ OutputFile="$(OutDir)\$(ProjectName).exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ IgnoreDefaultLibraryNames=""
+ ProgramDatabaseFile=".\../../../test/efc/Release/efc.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../test/efc/Debug/efc.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\../../../test/efc/Debug/efc.pch"
+ AssemblerListingLocation=".\../../../test/efc/Debug/"
+ ObjectFile=".\../../../test/efc/Debug/"
+ ProgramDataBaseFileName=".\../../../test/efc/Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ OutputFile="$(OutDir)\$(ProjectName).exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\../../../test/efc/Debug/efc.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\../../../test/efc/Debug/efc.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\../../../test/efc/Debug/efc.pch"
+ AssemblerListingLocation=".\../../../test/efc/Debug/"
+ ObjectFile=".\../../../test/efc/Debug/"
+ ProgramDataBaseFileName=".\../../../test/efc/Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ OutputFile="$(OutDir)\$(ProjectName).exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\../../../test/efc/Debug/efc.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\test\efc.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/windows/test/efcdll/efcdll.vcproj b/windows/test/efcdll/efcdll.vcproj new file mode 100644 index 0000000..384977f --- /dev/null +++ b/windows/test/efcdll/efcdll.vcproj @@ -0,0 +1,431 @@ +<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="efcdll"
+ ProjectGUID="{D8D53F43-41EE-486A-8DBD-956D8CD072E8}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../test/efcdll/Release/efcdll.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\../../../test/efcdll/Release/efcdll.pch"
+ AssemblerListingLocation=".\../../../test/efcdll/Release/"
+ ObjectFile=".\../../../test/efcdll/Release/"
+ ProgramDataBaseFileName=".\../../../test/efcdll/Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
+ OutputFile="$(OutDir)\$(ProjectName).exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ ProgramDatabaseFile=".\../../../test/efcdll/Release/efcdll.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\../../../test/efcdll/Release/efcdll.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\../../../test/efcdll/Release/efcdll.pch"
+ AssemblerListingLocation=".\../../../test/efcdll/Release/"
+ ObjectFile=".\../../../test/efcdll/Release/"
+ ProgramDataBaseFileName=".\../../../test/efcdll/Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
+ OutputFile="$(OutDir)\$(ProjectName).exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ ProgramDatabaseFile=".\../../../test/efcdll/Release/efcdll.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../test/efcdll/Debug/efcdll.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\../../../test/efcdll/Debug/efcdll.pch"
+ AssemblerListingLocation=".\../../../test/efcdll/Debug/"
+ ObjectFile=".\../../../test/efcdll/Debug/"
+ ProgramDataBaseFileName=".\../../../test/efcdll/Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
+ OutputFile="$(OutDir)\$(ProjectName).exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\../../../test/efcdll/Debug/efcdll.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\../../../test/efcdll/Debug/efcdll.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\../../../test/efcdll/Debug/efcdll.pch"
+ AssemblerListingLocation=".\../../../test/efcdll/Debug/"
+ ObjectFile=".\../../../test/efcdll/Debug/"
+ ProgramDataBaseFileName=".\../../../test/efcdll/Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
+ OutputFile="$(OutDir)\$(ProjectName).exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\../../../test/efcdll/Debug/efcdll.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\test\efc.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;"
+ />
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/windows/tools/checktools.bat b/windows/tools/checktools.bat index 376e1fb..87f30ca 100644 --- a/windows/tools/checktools.bat +++ b/windows/tools/checktools.bat @@ -161,3 +161,4 @@ rem on it for sending parameters. --SJW 9/6/07 popd
endlocal & exit /b %nerrors%
+
\ No newline at end of file |