diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-05-04 15:06:05 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-05-04 15:06:05 (GMT) |
| commit | 74f3326a67da158d8a808f92c59cae6e762c7c21 (patch) | |
| tree | 5e67766a57e87d3d1f7af0486a677c48bb8f5e2c | |
| parent | 2e3e3f9cd362e89d5a9f7847607d86690a32edab (diff) | |
| download | hdf5-74f3326a67da158d8a808f92c59cae6e762c7c21.zip hdf5-74f3326a67da158d8a808f92c59cae6e762c7c21.tar.gz hdf5-74f3326a67da158d8a808f92c59cae6e762c7c21.tar.bz2 | |
[svn-r29862] Convert source list names from *_SRCS to *_SOURCES.
Add/convert most tools to use new HDF5_TOOLS_DIR instead of HDF5_TOOLS_SRC_DIR CMake VAR.
28 files changed, 703 insertions, 695 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 648ae7a..9359084 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -186,6 +186,8 @@ set (HDF5_CPP_SRC_DIR ${HDF5_SOURCE_DIR}/c++) set (HDF5_CPP_TST_DIR ${HDF5_SOURCE_DIR}/c++/test) set (HDF5_HL_SRC_DIR ${HDF5_SOURCE_DIR}/hl) set (HDF5_HL_CPP_SRC_DIR ${HDF5_SOURCE_DIR}/hl/c++) +set (HDF5_HL_TOOLS_DIR ${HDF5_SOURCE_DIR}/hl/tools) +set (HDF5_TOOLS_DIR ${HDF5_SOURCE_DIR}/tools) set (HDF5_TOOLS_SRC_DIR ${HDF5_SOURCE_DIR}/tools) set (HDF5_PERFORM_SRC_DIR ${HDF5_SOURCE_DIR}/tools/perform) set (HDF5_F90_SRC_DIR ${HDF5_SOURCE_DIR}/fortran) diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt index 1a182e3..526b223 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -11,7 +11,7 @@ configure_file (${HDF_RESOURCES_DIR}/H5cxx_config.h.in #----------------------------------------------------------------------------- # Define cpp Library #----------------------------------------------------------------------------- -set (CPP_SRCS +set (CPP_SOURCES ${HDF5_CPP_SRC_SOURCE_DIR}/H5AbstractDs.cpp ${HDF5_CPP_SRC_SOURCE_DIR}/H5ArrayType.cpp ${HDF5_CPP_SRC_SOURCE_DIR}/H5AtomType.cpp @@ -78,7 +78,7 @@ set (CPP_HDRS ${HDF5_CPP_SRC_SOURCE_DIR}/H5VarLenType.h ) -add_library (${HDF5_CPP_LIB_TARGET} STATIC ${CPP_SRCS} ${CPP_HDRS}) +add_library (${HDF5_CPP_LIB_TARGET} STATIC ${CPP_SOURCES} ${CPP_HDRS}) TARGET_C_PROPERTIES (${HDF5_CPP_LIB_TARGET} STATIC " " " ") target_link_libraries (${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET}) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIB_TARGET}") @@ -90,7 +90,7 @@ set_target_properties (${HDF5_CPP_LIB_TARGET} PROPERTIES set (install_targets ${HDF5_CPP_LIB_TARGET}) if (BUILD_SHARED_LIBS) - add_library (${HDF5_CPP_LIBSH_TARGET} SHARED ${CPP_SRCS} ${CPP_HDRS}) + add_library (${HDF5_CPP_LIBSH_TARGET} SHARED ${CPP_SOURCES} ${CPP_HDRS}) TARGET_C_PROPERTIES (${HDF5_CPP_LIBSH_TARGET} SHARED " " " ") target_link_libraries (${HDF5_CPP_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIBSH_TARGET}") diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt index 4bebeac..dffe7a4 100644 --- a/c++/test/CMakeLists.txt +++ b/c++/test/CMakeLists.txt @@ -11,7 +11,7 @@ PROJECT (HDF5_CPP_TEST) #----------------------------------------------------------------------------- # Define Sources #----------------------------------------------------------------------------- -set (CPP_TEST_SRCS +set (CPP_TEST_SOURCES ${HDF5_CPP_TEST_SOURCE_DIR}/testhdf5.cpp ${HDF5_CPP_TEST_SOURCE_DIR}/tarray.cpp ${HDF5_CPP_TEST_SOURCE_DIR}/tattr.cpp @@ -35,7 +35,7 @@ set (CPP_TEST_SRCS set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}) configure_file (${HDF5_CPP_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h @ONLY) -add_executable (cpp_testhdf5 ${CPP_TEST_SRCS} ) +add_executable (cpp_testhdf5 ${CPP_TEST_SOURCES} ) TARGET_NAMING (cpp_testhdf5 STATIC) TARGET_C_PROPERTIES (cpp_testhdf5 STATIC " " " ") target_link_libraries (cpp_testhdf5 diff --git a/fortran/examples/CMakeTests.cmake b/fortran/examples/CMakeTests.cmake index 63e75c2..34230c8 100644 --- a/fortran/examples/CMakeTests.cmake +++ b/fortran/examples/CMakeTests.cmake @@ -23,6 +23,8 @@ mount2.h5 sdsf.h5 subset.h5 + SDScompound.h5 + test.h5 ) if (NOT "${last_test}" STREQUAL "") set_tests_properties (f90_ex-clear-objects PROPERTIES DEPENDS ${last_test}) @@ -46,6 +48,8 @@ mount2.h5 sdsf.h5 subset.h5 + SDScompound.h5 + test.h5 ) if (NOT "${last_test}" STREQUAL "") set_tests_properties (f90_ex-shared-clear-objects PROPERTIES DEPENDS ${last_test}) diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index 8ebbbd0..51e4887 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -96,7 +96,7 @@ add_custom_command ( #----------------------------------------------------------------------------- # f90CStub lib #----------------------------------------------------------------------------- -set (f90CStub_C_SRCS +set (f90CStub_C_SOURCES # normal distribution ${HDF5_F90_SRC_SOURCE_DIR}/H5f90kit.c ${HDF5_F90_SRC_SOURCE_DIR}/H5_f.c @@ -115,14 +115,14 @@ set (f90CStub_C_SRCS ${HDF5_F90_SRC_SOURCE_DIR}/H5Zf.c ) -set_source_files_properties (${f90CStub_C_SRCS} PROPERTIES LANGUAGE C) +set_source_files_properties (${f90CStub_C_SOURCES} PROPERTIES LANGUAGE C) set (f90CStub_C_HDRS # generated files ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h ) -add_library (${HDF5_F90_C_LIB_TARGET} STATIC ${f90CStub_C_SRCS} ${f90CStub_C_HDRS}) +add_library (${HDF5_F90_C_LIB_TARGET} STATIC ${f90CStub_C_SOURCES} ${f90CStub_C_HDRS}) TARGET_C_PROPERTIES (${HDF5_F90_C_LIB_TARGET} STATIC " " " ") target_link_libraries (${HDF5_F90_C_LIB_TARGET} ${HDF5_LIB_TARGET} ${LINK_LIBS}) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIB_TARGET}") @@ -135,7 +135,7 @@ set_target_properties (${HDF5_F90_C_LIB_TARGET} PROPERTIES set (install_targets ${HDF5_F90_C_LIB_TARGET}) if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) - add_library (${HDF5_F90_C_LIBSH_TARGET} SHARED ${f90CStub_C_SRCS} ${f90CStub_C_HDRS}) + add_library (${HDF5_F90_C_LIBSH_TARGET} SHARED ${f90CStub_C_SOURCES} ${f90CStub_C_HDRS}) TARGET_C_PROPERTIES (${HDF5_F90_C_LIBSH_TARGET} SHARED " " " ") target_link_libraries (${HDF5_F90_C_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} ${LINK_SHARED_LIBS}) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIBSH_TARGET}") @@ -155,7 +155,7 @@ set_source_files_properties (${HDF5_F90_BINARY_DIR}/H5_gen.F90 PROPERTIES GENERA #----------------------------------------------------------------------------- # Fortran Modules #----------------------------------------------------------------------------- -set (f90_F_BASE_SRCS +set (f90_F_BASE_SOURCES # generated files ${HDF5_F90_BINARY_DIR}/H5fortran_types.F90 @@ -178,8 +178,8 @@ set (f90_F_BASE_SRCS ${HDF5_F90_SRC_SOURCE_DIR}/H5Zff.F90 ) -set (f90_F_SRCS - ${f90_F_BASE_SRCS} +set (f90_F_SOURCES + ${f90_F_BASE_SOURCES} # generated file ${HDF5_F90_BINARY_DIR}/H5_gen.F90 @@ -193,15 +193,15 @@ add_custom_target (H5gen ALL COMMAND ${CMD} #v3.2 BYPRODUCT ${HDF5_F90_BINARY_DIR}/H5_gen.F90 WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR} - DEPENDS ${f90_F_BASE_SRCS} + DEPENDS ${f90_F_BASE_SOURCES} ) -set_source_files_properties (${f90_F_SRCS} PROPERTIES LANGUAGE Fortran) +set_source_files_properties (${f90_F_SOURCES} PROPERTIES LANGUAGE Fortran) #----------------------------------------------------------------------------- # Add Main fortran library #----------------------------------------------------------------------------- -add_library (${HDF5_F90_LIB_TARGET} STATIC ${f90_F_SRCS}) +add_library (${HDF5_F90_LIB_TARGET} STATIC ${f90_F_SOURCES}) set (SHARED_LINK_FLAGS " ") TARGET_FORTRAN_PROPERTIES (${HDF5_F90_LIB_TARGET} STATIC " " " ") target_link_libraries (${HDF5_F90_LIB_TARGET} ${HDF5_F90_C_LIB_TARGET} ${HDF5_LIB_TARGET}) @@ -224,7 +224,7 @@ endif (WIN32) set (install_targets ${install_targets} ${HDF5_F90_LIB_TARGET}) if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) - add_library (${HDF5_F90_LIBSH_TARGET} SHARED ${f90_F_SRCS}) + add_library (${HDF5_F90_LIBSH_TARGET} SHARED ${f90_F_SOURCES}) set (SHARED_LINK_FLAGS " ") if (WIN32 AND MSVC) set (SHARED_LINK_FLAGS "/DLL /DEF:${HDF5_F90_SRC_BINARY_DIR}/hdf5_fortrandll.def") diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt index 005a5c8..d1ca6e8 100644 --- a/fortran/test/CMakeLists.txt +++ b/fortran/test/CMakeLists.txt @@ -75,7 +75,7 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) ) endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) -set (HDF5_F90_TF_SRCS +set (HDF5_F90_TF_SOURCES # generated files ${HDF5_F90_BINARY_DIR}/tf_gen.F90 ) @@ -83,7 +83,7 @@ set_source_files_properties ( ${HDF5_F90_BINARY_DIR}/tf_gen.F90 PROPERTIES GENERATED TRUE ) -set_source_files_properties (tf.F90 ${HDF5_F90_BINARY_DIR}/${HDF5_F90_TF_SRCS} PROPERTIES LANGUAGE Fortran) +set_source_files_properties (tf.F90 ${HDF5_F90_BINARY_DIR}/${HDF5_F90_TF_SOURCES} PROPERTIES LANGUAGE Fortran) set (CMD $<TARGET_FILE:H5_test_buildiface>) add_custom_target (H5testgen ALL @@ -93,9 +93,9 @@ add_custom_target (H5testgen ALL DEPENDS H5_test_buildiface ) -add_library (${HDF5_F90_TEST_LIB_TARGET} STATIC tf.F90 ${HDF5_F90_TF_SRCS}) +add_library (${HDF5_F90_TEST_LIB_TARGET} STATIC tf.F90 ${HDF5_F90_TF_SOURCES}) if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) - add_library (${HDF5_F90_TEST_LIBSH_TARGET} SHARED tf.F90 ${HDF5_F90_TF_SRCS}) + add_library (${HDF5_F90_TEST_LIBSH_TARGET} SHARED tf.F90 ${HDF5_F90_TF_SOURCES}) endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) TARGET_FORTRAN_PROPERTIES (${HDF5_F90_TEST_LIB_TARGET} STATIC " " " ") diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt index 425a2fe..cec9406 100644 --- a/hl/c++/src/CMakeLists.txt +++ b/hl/c++/src/CMakeLists.txt @@ -7,10 +7,10 @@ PROJECT (HDF5_HL_CPP_SRC) INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/src) INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SRC_SOURCE_DIR}) -set (HDF5_HL_CPP_SRCS ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.cpp) +set (HDF5_HL_CPP_SOURCES ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.cpp) set (HDF5_HL_CPP_HDRS ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.h) -add_library (${HDF5_HL_CPP_LIB_TARGET} STATIC ${HDF5_HL_CPP_SRCS}) +add_library (${HDF5_HL_CPP_LIB_TARGET} STATIC ${HDF5_HL_CPP_SOURCES}) TARGET_C_PROPERTIES (${HDF5_HL_CPP_LIB_TARGET} STATIC " " " ") target_link_libraries ( ${HDF5_HL_CPP_LIB_TARGET} @@ -26,7 +26,7 @@ set_target_properties (${HDF5_HL_CPP_LIB_TARGET} PROPERTIES set (install_targets ${HDF5_HL_CPP_LIB_TARGET}) if (BUILD_SHARED_LIBS) - add_library (${HDF5_HL_CPP_LIBSH_TARGET} SHARED ${HDF5_HL_CPP_SRCS}) + add_library (${HDF5_HL_CPP_LIBSH_TARGET} SHARED ${HDF5_HL_CPP_SOURCES}) TARGET_C_PROPERTIES (${HDF5_HL_CPP_LIBSH_TARGET} SHARED " " " ") target_link_libraries ( ${HDF5_HL_CPP_LIBSH_TARGET} diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index a566314..6419ab8 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -63,18 +63,18 @@ INCLUDE_DIRECTORIES ( #----------------------------------------------------------------------------- # hl_f90CStub lib #----------------------------------------------------------------------------- -set (HDF5_HL_F90_C_SRCS +set (HDF5_HL_F90_C_SOURCES ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5DSfc.c ${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_source_files_properties (${HDF5_HL_F90_C_SOURCES} PROPERTIES LANGUAGE C) set (HDF5_HL_F90_HEADERS ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTf90proto.h) -add_library (${HDF5_HL_F90_C_LIB_TARGET} STATIC ${HDF5_HL_F90_C_SRCS} ${HDF5_HL_F90_HEADERS}) +add_library (${HDF5_HL_F90_C_LIB_TARGET} STATIC ${HDF5_HL_F90_C_SOURCES} ${HDF5_HL_F90_HEADERS}) TARGET_C_PROPERTIES (${HDF5_HL_F90_C_LIB_TARGET} STATIC " " " ") 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}") @@ -87,7 +87,7 @@ set_target_properties (${HDF5_HL_F90_C_LIB_TARGET} PROPERTIES set (install_targets ${HDF5_HL_F90_C_LIB_TARGET}) if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) - add_library (${HDF5_HL_F90_C_LIBSH_TARGET} SHARED ${HDF5_HL_F90_C_SRCS} ${HDF5_HL_F90_HEADERS}) + add_library (${HDF5_HL_F90_C_LIBSH_TARGET} SHARED ${HDF5_HL_F90_C_SOURCES} ${HDF5_HL_F90_HEADERS}) TARGET_C_PROPERTIES (${HDF5_HL_F90_C_LIBSH_TARGET} SHARED " " " ") target_link_libraries (${HDF5_HL_F90_C_LIBSH_TARGET} ${HDF5_F90_C_LIBSH_TARGET} ${HDF5_HL_LIBSH_TARGET}) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_C_LIBSH_TARGET}") @@ -105,21 +105,21 @@ endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) #----------------------------------------------------------------------------- # Fortran Modules #----------------------------------------------------------------------------- -set (HDF5_HL_F90_F_BASE_SRCS +set (HDF5_HL_F90_F_BASE_SOURCES ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5DSff.F90 ${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_F_SRCS - ${HDF5_HL_F90_F_BASE_SRCS} +set (HDF5_HL_F90_F_SOURCES + ${HDF5_HL_F90_F_BASE_SOURCES} # generated files ${HDF5_HL_F90_SRC_BINARY_DIR}/H5LTff_gen.F90 ${HDF5_HL_F90_SRC_BINARY_DIR}/H5TBff_gen.F90 ) -set_source_files_properties (${HDF5_HL_F90_F_SRCS} PROPERTIES LANGUAGE Fortran) +set_source_files_properties (${HDF5_HL_F90_F_SOURCES} PROPERTIES LANGUAGE Fortran) set_source_files_properties ( ${HDF5_HL_F90_SRC_BINARY_DIR}/H5LTff_gen.F90 @@ -133,10 +133,10 @@ add_custom_target (H5HLgen ALL #v3.2 BYPRODUCT ${HDF5_HL_F90_SRC_BINARY_DIR}/H5LTff_gen.F90 #v3.2 ${HDF5_HL_F90_SRC_BINARY_DIR}/H5TBff_gen.F90 WORKING_DIRECTORY ${HDF5_HL_F90_SRC_BINARY_DIR} - DEPENDS ${HDF5_HL_F90_F_BASE_SRCS} + DEPENDS ${HDF5_HL_F90_F_BASE_SOURCES} ) -add_library (${HDF5_HL_F90_LIB_TARGET} STATIC ${HDF5_HL_F90_F_SRCS}) +add_library (${HDF5_HL_F90_LIB_TARGET} STATIC ${HDF5_HL_F90_F_SOURCES}) TARGET_FORTRAN_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} STATIC " " " ") 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}") @@ -155,7 +155,7 @@ endif (WIN32) set (install_targets ${install_targets} ${HDF5_HL_F90_LIB_TARGET}) if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) - add_library (${HDF5_HL_F90_LIBSH_TARGET} SHARED ${HDF5_HL_F90_F_SRCS}) + add_library (${HDF5_HL_F90_LIBSH_TARGET} SHARED ${HDF5_HL_F90_F_SOURCES}) set (SHARED_LINK_FLAGS " ") if (WIN32 AND MSVC) set (SHARED_LINK_FLAGS "/DLL /DEF:${HDF5_HL_F90_SRC_BINARY_DIR}/hdf5_hl_fortrandll.def") diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt index a86bf4f..a55a16b 100644 --- a/hl/src/CMakeLists.txt +++ b/hl/src/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT (HDF5_HL_SRC) #----------------------------------------------------------------------------- # List Source files #----------------------------------------------------------------------------- -set (HL_SRCS +set (HL_SOURCES ${HDF5_HL_SRC_SOURCE_DIR}/H5DO.c ${HDF5_HL_SRC_SOURCE_DIR}/H5DS.c ${HDF5_HL_SRC_SOURCE_DIR}/H5IM.c @@ -13,6 +13,7 @@ set (HL_SRCS ${HDF5_HL_SRC_SOURCE_DIR}/H5LTparse.c ${HDF5_HL_SRC_SOURCE_DIR}/H5PT.c ${HDF5_HL_SRC_SOURCE_DIR}/H5TB.c + ${HDF5_HL_SRC_SOURCE_DIR}/H5LD.c ) set (HL_HEADERS @@ -24,10 +25,11 @@ set (HL_HEADERS ${HDF5_HL_SRC_SOURCE_DIR}/H5LTpublic.h ${HDF5_HL_SRC_SOURCE_DIR}/H5PTpublic.h ${HDF5_HL_SRC_SOURCE_DIR}/H5TBpublic.h + ${HDF5_HL_SRC_SOURCE_DIR}/H5LDpublic.h ${HDF5_HL_SRC_SOURCE_DIR}/hdf5_hl.h ) -add_library (${HDF5_HL_LIB_TARGET} STATIC ${HL_SRCS} ${HL_HEADERS}) +add_library (${HDF5_HL_LIB_TARGET} STATIC ${HL_SOURCES} ${HL_HEADERS}) TARGET_C_PROPERTIES (${HDF5_HL_LIB_TARGET} STATIC " " " ") target_link_libraries (${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET}) H5_SET_LIB_OPTIONS (${HDF5_HL_LIB_TARGET} ${HDF5_HL_LIB_NAME} STATIC) @@ -39,7 +41,7 @@ set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF set (install_targets ${HDF5_HL_LIB_TARGET}) if (BUILD_SHARED_LIBS) - add_library (${HDF5_HL_LIBSH_TARGET} SHARED ${HL_SRCS} ${HL_HEADERS}) + add_library (${HDF5_HL_LIBSH_TARGET} SHARED ${HL_SOURCES} ${HL_HEADERS}) TARGET_C_PROPERTIES (${HDF5_HL_LIBSH_TARGET} SHARED " " " ") target_link_libraries (${HDF5_HL_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) H5_SET_LIB_OPTIONS (${HDF5_HL_LIBSH_TARGET} ${HDF5_HL_LIB_NAME} SHARED ${HDF5_HL_PACKAGE_SOVERSION}) diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt index 4ee059d..9038800 100644 --- a/java/test/CMakeLists.txt +++ b/java/test/CMakeLists.txt @@ -8,7 +8,7 @@ INCLUDE_DIRECTORIES ( ${HDF5_JAVA_HDF5_LIB_DIR} ) -set (HDF5_JAVA_TEST_SRCS +set (HDF5_JAVA_TEST_SOURCES TestH5.java TestH5E.java TestH5Edefault.java @@ -53,7 +53,7 @@ file (WRITE ${PROJECT_BINARY_DIR}/Manifest.txt set (CMAKE_JAVA_INCLUDE_PATH "${HDF5_JAVA_LIB_DIR}/junit.jar;${HDF5_JAVA_LIB_DIR}/hamcrest-core.jar;${HDF5_JAVA_JARS};${HDF5_JAVA_LOGGING_JAR};${HDF5_JAVA_LOGGING_SIMPLE_JAR}") -add_jar (${HDF5_JAVA_TEST_LIB_TARGET} MANIFEST ${PROJECT_BINARY_DIR}/Manifest.txt ${HDF5_JAVA_TEST_SRCS}) +add_jar (${HDF5_JAVA_TEST_LIB_TARGET} MANIFEST ${PROJECT_BINARY_DIR}/Manifest.txt ${HDF5_JAVA_TEST_SOURCES}) get_target_property (${HDF5_JAVA_TEST_LIB_TARGET}_JAR_FILE ${HDF5_JAVA_TEST_LIB_TARGET} JAR_FILE) #install_jar (${HDF5_JAVA_TEST_LIB_TARGET} ${HJAVA_INSTALL_DATA_DIR}/tests tests) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c9fb8c7..8461229 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,7 +9,7 @@ add_definitions (${HDF_EXTRA_C_FLAGS}) #----------------------------------------------------------------------------- # List Source Files #----------------------------------------------------------------------------- -set (H5_SRCS +set (H5_SOURCES ${HDF5_SRC_DIR}/H5.c ${HDF5_SRC_DIR}/H5checksum.c ${HDF5_SRC_DIR}/H5dbg.c @@ -25,9 +25,9 @@ set (H5_HDRS #${HDF5_SRC_DIR}/H5version.h #${HDF5_SRC_DIR}/H5overflow.h ) -IDE_GENERATED_PROPERTIES ("H5" "${H5_HDRS}" "${H5_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5" "${H5_HDRS}" "${H5_SOURCES}" ) -set (H5A_SRCS +set (H5A_SOURCES ${HDF5_SRC_DIR}/H5A.c ${HDF5_SRC_DIR}/H5Abtree2.c ${HDF5_SRC_DIR}/H5Adense.c @@ -40,9 +40,9 @@ set (H5A_HDRS ${HDF5_SRC_DIR}/H5Apkg.h ${HDF5_SRC_DIR}/H5Apublic.h ) -IDE_GENERATED_PROPERTIES ("H5A" "${H5A_HDRS}" "${H5A_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5A" "${H5A_HDRS}" "${H5A_SOURCES}" ) -set (H5AC_SRCS +set (H5AC_SOURCES ${HDF5_SRC_DIR}/H5AC.c ${HDF5_SRC_DIR}/H5ACmpio.c ) @@ -51,9 +51,9 @@ set (H5AC_HDRS ${HDF5_SRC_DIR}/H5ACpkg.h ${HDF5_SRC_DIR}/H5ACpublic.h ) -IDE_GENERATED_PROPERTIES ("H5AC" "${H5AC_HDRS}" "${H5AC_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5AC" "${H5AC_HDRS}" "${H5AC_SOURCES}" ) -set (H5B_SRCS +set (H5B_SOURCES ${HDF5_SRC_DIR}/H5B.c ${HDF5_SRC_DIR}/H5Bcache.c ${HDF5_SRC_DIR}/H5Bdbg.c @@ -62,10 +62,10 @@ set (H5B_HDRS ${HDF5_SRC_DIR}/H5Bpkg.h ${HDF5_SRC_DIR}/H5Bpublic.h ) -IDE_GENERATED_PROPERTIES ("H5B" "${H5B_HDRS}" "${H5B_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5B" "${H5B_HDRS}" "${H5B_SOURCES}" ) -set (H5B2_SRCS +set (H5B2_SOURCES ${HDF5_SRC_DIR}/H5B2.c ${HDF5_SRC_DIR}/H5B2cache.c ${HDF5_SRC_DIR}/H5B2dbg.c @@ -78,10 +78,10 @@ set (H5B2_HDRS ${HDF5_SRC_DIR}/H5B2pkg.h ${HDF5_SRC_DIR}/H5B2public.h ) -IDE_GENERATED_PROPERTIES ("H5B2" "${H5B2_HDRS}" "${H5B2_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5B2" "${H5B2_HDRS}" "${H5B2_SOURCES}" ) -set (H5C_SRCS +set (H5C_SOURCES ${HDF5_SRC_DIR}/H5C.c ${HDF5_SRC_DIR}/H5Cmpio.c ) @@ -89,18 +89,18 @@ set (H5C_HDRS ${HDF5_SRC_DIR}/H5Cpkg.h ${HDF5_SRC_DIR}/H5Cpublic.h ) -IDE_GENERATED_PROPERTIES ("H5C" "${H5C_HDRS}" "${H5C_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5C" "${H5C_HDRS}" "${H5C_SOURCES}" ) -set (H5CS_SRCS +set (H5CS_SOURCES ${HDF5_SRC_DIR}/H5CS.c ) set (H5CS_HDRS ) -IDE_GENERATED_PROPERTIES ("H5CS" "${H5CS_HDRS}" "${H5CS_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5CS" "${H5CS_HDRS}" "${H5CS_SOURCES}" ) -set (H5D_SRCS +set (H5D_SOURCES ${HDF5_SRC_DIR}/H5D.c ${HDF5_SRC_DIR}/H5Dbtree.c ${HDF5_SRC_DIR}/H5Dbtree2.c @@ -130,9 +130,9 @@ set (H5D_HDRS ${HDF5_SRC_DIR}/H5Dpkg.h ${HDF5_SRC_DIR}/H5Dpublic.h ) -IDE_GENERATED_PROPERTIES ("H5D" "${H5D_HDRS}" "${H5D_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5D" "${H5D_HDRS}" "${H5D_SOURCES}" ) -set (H5E_SRCS +set (H5E_SOURCES ${HDF5_SRC_DIR}/H5E.c ${HDF5_SRC_DIR}/H5Edeprec.c ${HDF5_SRC_DIR}/H5Eint.c @@ -146,10 +146,10 @@ set (H5E_HDRS ${HDF5_SRC_DIR}/H5Epublic.h #${HDF5_SRC_DIR}/H5Eterm.h ) -IDE_GENERATED_PROPERTIES ("H5E" "${H5E_HDRS}" "${H5E_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5E" "${H5E_HDRS}" "${H5E_SOURCES}" ) -set (H5EA_SRCS +set (H5EA_SOURCES ${HDF5_SRC_DIR}/H5EA.c ${HDF5_SRC_DIR}/H5EAcache.c ${HDF5_SRC_DIR}/H5EAdbg.c @@ -165,10 +165,10 @@ set (H5EA_SRCS set (H5EA_HDRS ${HDF5_SRC_DIR}/H5EApkg.h ) -IDE_GENERATED_PROPERTIES ("H5EA" "${H5EA_HDRS}" "${H5EA_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5EA" "${H5EA_HDRS}" "${H5EA_SOURCES}" ) -set (H5F_SRCS +set (H5F_SOURCES ${HDF5_SRC_DIR}/H5F.c ${HDF5_SRC_DIR}/H5Faccum.c ${HDF5_SRC_DIR}/H5Fcwfs.c @@ -191,10 +191,10 @@ set (H5F_HDRS ${HDF5_SRC_DIR}/H5Fpkg.h ${HDF5_SRC_DIR}/H5Fpublic.h ) -IDE_GENERATED_PROPERTIES ("H5F" "${H5F_HDRS}" "${H5F_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5F" "${H5F_HDRS}" "${H5F_SOURCES}" ) -set (H5FA_SRCS +set (H5FA_SOURCES ${HDF5_SRC_DIR}/H5FA.c ${HDF5_SRC_DIR}/H5FAcache.c ${HDF5_SRC_DIR}/H5FAdbg.c @@ -207,10 +207,10 @@ set (H5FA_SRCS set (H5FA_HDRS ${HDF5_SRC_DIR}/H5FApkg.h ) -IDE_GENERATED_PROPERTIES ("H5FA" "${H5FA_HDRS}" "${H5FA_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5FA" "${H5FA_HDRS}" "${H5FA_SOURCES}" ) -set (H5FD_SRCS +set (H5FD_SOURCES ${HDF5_SRC_DIR}/H5FD.c ${HDF5_SRC_DIR}/H5FDcore.c ${HDF5_SRC_DIR}/H5FDdirect.c @@ -240,26 +240,26 @@ set (H5FD_HDRS ${HDF5_SRC_DIR}/H5FDstdio.h ${HDF5_SRC_DIR}/H5FDwindows.h ) -IDE_GENERATED_PROPERTIES ("H5FD" "${H5FD_HDRS}" "${H5FD_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5FD" "${H5FD_HDRS}" "${H5FD_SOURCES}" ) -set (H5FL_SRCS +set (H5FL_SOURCES ${HDF5_SRC_DIR}/H5FL.c ) set (H5FL_HDRS ) -IDE_GENERATED_PROPERTIES ("H5FL" "${H5FL_HDRS}" "${H5FL_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5FL" "${H5FL_HDRS}" "${H5FL_SOURCES}" ) -set (H5FO_SRCS +set (H5FO_SOURCES ${HDF5_SRC_DIR}/H5FO.c ) set (H5FO_HDRS ) -IDE_GENERATED_PROPERTIES ("H5FO" "${H5FO_HDRS}" "${H5FO_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5FO" "${H5FO_HDRS}" "${H5FO_SOURCES}" ) -set (H5FS_SRCS +set (H5FS_SOURCES ${HDF5_SRC_DIR}/H5FS.c ${HDF5_SRC_DIR}/H5FScache.c ${HDF5_SRC_DIR}/H5FSdbg.c @@ -272,9 +272,9 @@ set (H5FS_HDRS ${HDF5_SRC_DIR}/H5FSpkg.h ${HDF5_SRC_DIR}/H5FSpublic.h ) -IDE_GENERATED_PROPERTIES ("H5FS" "${H5FS_HDRS}" "${H5FS_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5FS" "${H5FS_HDRS}" "${H5FS_SOURCES}" ) -set (H5G_SRCS +set (H5G_SOURCES ${HDF5_SRC_DIR}/H5G.c ${HDF5_SRC_DIR}/H5Gbtree2.c ${HDF5_SRC_DIR}/H5Gcache.c @@ -299,9 +299,9 @@ set (H5G_HDRS ${HDF5_SRC_DIR}/H5Gpkg.h ${HDF5_SRC_DIR}/H5Gpublic.h ) -IDE_GENERATED_PROPERTIES ("H5G" "${H5G_HDRS}" "${H5G_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5G" "${H5G_HDRS}" "${H5G_SOURCES}" ) -set (H5HF_SRCS +set (H5HF_SOURCES ${HDF5_SRC_DIR}/H5HF.c ${HDF5_SRC_DIR}/H5HFbtree2.c ${HDF5_SRC_DIR}/H5HFcache.c @@ -324,9 +324,9 @@ set (H5HF_HDRS ${HDF5_SRC_DIR}/H5HFpkg.h ${HDF5_SRC_DIR}/H5HFpublic.h ) -IDE_GENERATED_PROPERTIES ("H5HF" "${H5HF_HDRS}" "${H5HF_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5HF" "${H5HF_HDRS}" "${H5HF_SOURCES}" ) -set (H5HG_SRCS +set (H5HG_SOURCES ${HDF5_SRC_DIR}/H5HG.c ${HDF5_SRC_DIR}/H5HGcache.c ${HDF5_SRC_DIR}/H5HGdbg.c @@ -337,9 +337,9 @@ set (H5HG_HDRS ${HDF5_SRC_DIR}/H5HGpkg.h ${HDF5_SRC_DIR}/H5HGpublic.h ) -IDE_GENERATED_PROPERTIES ("H5HG" "${H5HG_HDRS}" "${H5HG_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5HG" "${H5HG_HDRS}" "${H5HG_SOURCES}" ) -set (H5HL_SRCS +set (H5HL_SOURCES ${HDF5_SRC_DIR}/H5HL.c ${HDF5_SRC_DIR}/H5HLcache.c ${HDF5_SRC_DIR}/H5HLdbg.c @@ -352,18 +352,18 @@ set (H5HL_HDRS ${HDF5_SRC_DIR}/H5HLpkg.h ${HDF5_SRC_DIR}/H5HLpublic.h ) -IDE_GENERATED_PROPERTIES ("H5HL" "${H5HL_HDRS}" "${H5HL_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5HL" "${H5HL_HDRS}" "${H5HL_SOURCES}" ) -set (H5HP_SRCS +set (H5HP_SOURCES ${HDF5_SRC_DIR}/H5HP.c ) set (H5HP_HDRS ) -IDE_GENERATED_PROPERTIES ("H5HP" "${H5HP_HDRS}" "${H5HP_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5HP" "${H5HP_HDRS}" "${H5HP_SOURCES}" ) -set (H5I_SRCS +set (H5I_SOURCES ${HDF5_SRC_DIR}/H5I.c ${HDF5_SRC_DIR}/H5Itest.c ) @@ -371,10 +371,10 @@ set (H5I_HDRS ${HDF5_SRC_DIR}/H5Ipkg.h ${HDF5_SRC_DIR}/H5Ipublic.h ) -IDE_GENERATED_PROPERTIES ("H5I" "${H5I_HDRS}" "${H5I_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5I" "${H5I_HDRS}" "${H5I_SOURCES}" ) -set (H5L_SRCS +set (H5L_SOURCES ${HDF5_SRC_DIR}/H5L.c ${HDF5_SRC_DIR}/H5Lexternal.c ) @@ -382,10 +382,10 @@ set (H5L_HDRS ${HDF5_SRC_DIR}/H5Lpkg.h ${HDF5_SRC_DIR}/H5Lpublic.h ) -IDE_GENERATED_PROPERTIES ("H5L" "${H5L_HDRS}" "${H5L_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5L" "${H5L_HDRS}" "${H5L_SOURCES}" ) -set (H5MF_SRCS +set (H5MF_SOURCES ${HDF5_SRC_DIR}/H5MF.c ${HDF5_SRC_DIR}/H5MFaggr.c ${HDF5_SRC_DIR}/H5MFdbg.c @@ -394,19 +394,19 @@ set (H5MF_SRCS set (H5MF_HDRS ) -IDE_GENERATED_PROPERTIES ("H5MF" "${H5MF_HDRS}" "${H5MF_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5MF" "${H5MF_HDRS}" "${H5MF_SOURCES}" ) -set (H5MM_SRCS +set (H5MM_SOURCES ${HDF5_SRC_DIR}/H5MM.c ) set (H5MM_HDRS ${HDF5_SRC_DIR}/H5MMpublic.h ) -IDE_GENERATED_PROPERTIES ("H5MM" "${H5MM_HDRS}" "${H5MM_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5MM" "${H5MM_HDRS}" "${H5MM_SOURCES}" ) -set (H5MP_SRCS +set (H5MP_SOURCES ${HDF5_SRC_DIR}/H5MP.c ${HDF5_SRC_DIR}/H5MPtest.c ) @@ -414,9 +414,9 @@ set (H5MP_SRCS set (H5MP_HDRS ${HDF5_SRC_DIR}/H5MPpkg.h ) -IDE_GENERATED_PROPERTIES ("H5MP" "${H5MP_HDRS}" "${H5MP_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5MP" "${H5MP_HDRS}" "${H5MP_SOURCES}" ) -set (H5O_SRCS +set (H5O_SOURCES ${HDF5_SRC_DIR}/H5O.c ${HDF5_SRC_DIR}/H5Oainfo.c ${HDF5_SRC_DIR}/H5Oalloc.c @@ -458,9 +458,9 @@ set (H5O_HDRS ${HDF5_SRC_DIR}/H5Opublic.h ${HDF5_SRC_DIR}/H5Oshared.h ) -IDE_GENERATED_PROPERTIES ("H5O" "${H5O_HDRS}" "${H5O_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5O" "${H5O_HDRS}" "${H5O_SOURCES}" ) -set (H5P_SRCS +set (H5P_SOURCES ${HDF5_SRC_DIR}/H5P.c ${HDF5_SRC_DIR}/H5Pacpl.c ${HDF5_SRC_DIR}/H5Pdapl.c @@ -485,9 +485,9 @@ set (H5P_HDRS ${HDF5_SRC_DIR}/H5Ppkg.h ${HDF5_SRC_DIR}/H5Ppublic.h ) -IDE_GENERATED_PROPERTIES ("H5P" "${H5P_HDRS}" "${H5P_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5P" "${H5P_HDRS}" "${H5P_SOURCES}" ) -set (H5PL_SRCS +set (H5PL_SOURCES ${HDF5_SRC_DIR}/H5PL.c ) @@ -495,10 +495,10 @@ set (H5PL_HDRS ${HDF5_SRC_DIR}/H5PLextern.h ${HDF5_SRC_DIR}/H5PLpublic.h ) -IDE_GENERATED_PROPERTIES ("H5PL" "${H5PL_HDRS}" "${H5PL_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5PL" "${H5PL_HDRS}" "${H5PL_SOURCES}" ) -set (H5R_SRCS +set (H5R_SOURCES ${HDF5_SRC_DIR}/H5R.c ${HDF5_SRC_DIR}/H5Rdeprec.c ) @@ -506,18 +506,18 @@ set (H5R_HDRS ${HDF5_SRC_DIR}/H5Rpkg.h ${HDF5_SRC_DIR}/H5Rpublic.h ) -IDE_GENERATED_PROPERTIES ("H5R" "${H5R_HDRS}" "${H5R_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5R" "${H5R_HDRS}" "${H5R_SOURCES}" ) -set (H5RS_SRCS +set (H5RS_SOURCES ${HDF5_SRC_DIR}/H5RS.c ) set (H5RS_HDRS ) -IDE_GENERATED_PROPERTIES ("H5RS" "${H5RS_HDRS}" "${H5RS_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5RS" "${H5RS_HDRS}" "${H5RS_SOURCES}" ) -set (H5S_SRCS +set (H5S_SOURCES ${HDF5_SRC_DIR}/H5S.c ${HDF5_SRC_DIR}/H5Sall.c ${HDF5_SRC_DIR}/H5Sdbg.c @@ -533,18 +533,18 @@ set (H5S_HDRS ${HDF5_SRC_DIR}/H5Spkg.h ${HDF5_SRC_DIR}/H5Spublic.h ) -IDE_GENERATED_PROPERTIES ("H5S" "${H5S_HDRS}" "${H5S_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5S" "${H5S_HDRS}" "${H5S_SOURCES}" ) -set (H5SL_SRCS +set (H5SL_SOURCES ${HDF5_SRC_DIR}/H5SL.c ) set (H5SL_HDRS ) -IDE_GENERATED_PROPERTIES ("H5SL" "${H5SL_HDRS}" "${H5SL_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5SL" "${H5SL_HDRS}" "${H5SL_SOURCES}" ) -set (H5SM_SRCS +set (H5SM_SOURCES ${HDF5_SRC_DIR}/H5SM.c ${HDF5_SRC_DIR}/H5SMbtree2.c ${HDF5_SRC_DIR}/H5SMcache.c @@ -555,18 +555,18 @@ set (H5SM_SRCS set (H5SM_HDRS ${HDF5_SRC_DIR}/H5SMpkg.h ) -IDE_GENERATED_PROPERTIES ("H5SM" "${H5SM_HDRS}" "${H5SM_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5SM" "${H5SM_HDRS}" "${H5SM_SOURCES}" ) -set (H5ST_SRCS +set (H5ST_SOURCES ${HDF5_SRC_DIR}/H5ST.c ) set (H5ST_HDRS ) -IDE_GENERATED_PROPERTIES ("H5ST" "${H5ST_HDRS}" "${H5ST_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5ST" "${H5ST_HDRS}" "${H5ST_SOURCES}" ) -set (H5T_SRCS +set (H5T_SOURCES ${HDF5_SRC_DIR}/H5T.c ${HDF5_SRC_DIR}/H5Tarray.c ${HDF5_SRC_DIR}/H5Tbit.c @@ -596,42 +596,42 @@ set (H5T_HDRS ${HDF5_SRC_DIR}/H5Tpkg.h ${HDF5_SRC_DIR}/H5Tpublic.h ) -IDE_GENERATED_PROPERTIES ("H5T" "${H5T_HDRS}" "${H5T_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5T" "${H5T_HDRS}" "${H5T_SOURCES}" ) -set (H5TS_SRCS +set (H5TS_SOURCES ${HDF5_SRC_DIR}/H5TS.c ) set (H5TS_HDRS ) -IDE_GENERATED_PROPERTIES ("H5TS" "${H5TS_HDRS}" "${H5TS_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5TS" "${H5TS_HDRS}" "${H5TS_SOURCES}" ) -set (H5UC_SRCS +set (H5UC_SOURCES ${HDF5_SRC_DIR}/H5UC.c ) set (H5UC_HDRS ) -IDE_GENERATED_PROPERTIES ("H5UC" "${H5UC_HDRS}" "${H5UC_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5UC" "${H5UC_HDRS}" "${H5UC_SOURCES}" ) -set (H5VM_SRCS +set (H5VM_SOURCES ${HDF5_SRC_DIR}/H5VM.c ) set (H5VM_HDRS ) -IDE_GENERATED_PROPERTIES ("H5VM" "${H5VM_HDRS}" "${H5VM_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5VM" "${H5VM_HDRS}" "${H5VM_SOURCES}" ) -set (H5WB_SRCS +set (H5WB_SOURCES ${HDF5_SRC_DIR}/H5WB.c ) set (H5WB_HDRS ) -IDE_GENERATED_PROPERTIES ("H5WB" "${H5WB_HDRS}" "${H5WB_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5WB" "${H5WB_HDRS}" "${H5WB_SOURCES}" ) -set (H5Z_SRCS +set (H5Z_SOURCES ${HDF5_SRC_DIR}/H5Z.c ${HDF5_SRC_DIR}/H5Zdeflate.c ${HDF5_SRC_DIR}/H5Zfletcher32.c @@ -651,50 +651,50 @@ set (H5Z_HDRS ${HDF5_SRC_DIR}/H5Zpkg.h ${HDF5_SRC_DIR}/H5Zpublic.h ) -IDE_GENERATED_PROPERTIES ("H5Z" "${H5Z_HDRS}" "${H5Z_SRCS}" ) +IDE_GENERATED_PROPERTIES ("H5Z" "${H5Z_HDRS}" "${H5Z_SOURCES}" ) set (common_SRCS - ${H5_SRCS} - ${H5A_SRCS} - ${H5AC_SRCS} - ${H5B_SRCS} - ${H5B2_SRCS} - ${H5C_SRCS} - ${H5CS_SRCS} - ${H5D_SRCS} - ${H5E_SRCS} - ${H5EA_SRCS} - ${H5F_SRCS} - ${H5FA_SRCS} - ${H5FD_SRCS} - ${H5FL_SRCS} - ${H5FO_SRCS} - ${H5FS_SRCS} - ${H5G_SRCS} - ${H5HF_SRCS} - ${H5HG_SRCS} - ${H5HL_SRCS} - ${H5HP_SRCS} - ${H5I_SRCS} - ${H5L_SRCS} - ${H5MF_SRCS} - ${H5MM_SRCS} - ${H5MP_SRCS} - ${H5O_SRCS} - ${H5P_SRCS} - ${H5PL_SRCS} - ${H5R_SRCS} - ${H5UC_SRCS} - ${H5RS_SRCS} - ${H5S_SRCS} - ${H5SL_SRCS} - ${H5SM_SRCS} - ${H5ST_SRCS} - ${H5T_SRCS} - ${H5TS_SRCS} - ${H5VM_SRCS} - ${H5WB_SRCS} - ${H5Z_SRCS} + ${H5_SOURCES} + ${H5A_SOURCES} + ${H5AC_SOURCES} + ${H5B_SOURCES} + ${H5B2_SOURCES} + ${H5C_SOURCES} + ${H5CS_SOURCES} + ${H5D_SOURCES} + ${H5E_SOURCES} + ${H5EA_SOURCES} + ${H5F_SOURCES} + ${H5FA_SOURCES} + ${H5FD_SOURCES} + ${H5FL_SOURCES} + ${H5FO_SOURCES} + ${H5FS_SOURCES} + ${H5G_SOURCES} + ${H5HF_SOURCES} + ${H5HG_SOURCES} + ${H5HL_SOURCES} + ${H5HP_SOURCES} + ${H5I_SOURCES} + ${H5L_SOURCES} + ${H5MF_SOURCES} + ${H5MM_SOURCES} + ${H5MP_SOURCES} + ${H5O_SOURCES} + ${H5P_SOURCES} + ${H5PL_SOURCES} + ${H5R_SOURCES} + ${H5UC_SOURCES} + ${H5RS_SOURCES} + ${H5S_SOURCES} + ${H5SL_SOURCES} + ${H5SM_SOURCES} + ${H5ST_SOURCES} + ${H5T_SOURCES} + ${H5TS_SOURCES} + ${H5VM_SOURCES} + ${H5WB_SOURCES} + ${H5Z_SOURCES} ) set (H5_PUBLIC_HEADERS diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt index 634afe3..58135b7 100644 --- a/testpar/CMakeLists.txt +++ b/testpar/CMakeLists.txt @@ -7,12 +7,12 @@ PROJECT (HDF5_TEST_PAR) add_definitions (${HDF_EXTRA_C_FLAGS}) INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR}) -INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib ) +INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib ) #----------------------------------------------------------------------------- # Define Tests #----------------------------------------------------------------------------- -set (testphdf5_SRCS +set (testphdf5_SOURCES ${HDF5_TEST_PAR_SOURCE_DIR}/testphdf5.c ${HDF5_TEST_PAR_SOURCE_DIR}/t_dset.c ${HDF5_TEST_PAR_SOURCE_DIR}/t_file.c @@ -27,7 +27,7 @@ set (testphdf5_SRCS ) #-- Adding test for testhdf5 -add_executable (testphdf5 ${testphdf5_SRCS}) +add_executable (testphdf5 ${testphdf5_SOURCES}) TARGET_NAMING (testphdf5 STATIC) TARGET_C_PROPERTIES (testphdf5 STATIC " " " ") target_link_libraries (testphdf5 ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET} ${LINK_LIBS}) diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt index 63b9b5d..4c44ac2 100644 --- a/tools/h5copy/CMakeLists.txt +++ b/tools/h5copy/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_H5COPY) #----------------------------------------------------------------------------- # Setup include Directories #----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib) +INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib) # -------------------------------------------------------------------- # Add the h5copy and test executables diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt index 59a3241..3902bd4 100644 --- a/tools/h5diff/CMakeLists.txt +++ b/tools/h5diff/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_H5DIFF) #----------------------------------------------------------------------------- # Setup include Directories #----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib) +INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib) # -------------------------------------------------------------------- # Add the h5diff executables diff --git a/tools/h5diff/CMakeTests.cmake b/tools/h5diff/CMakeTests.cmake index c815325..7698cc1 100644 --- a/tools/h5diff/CMakeTests.cmake +++ b/tools/h5diff/CMakeTests.cmake @@ -51,29 +51,29 @@ ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/non_comparables1.h5 ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/non_comparables2.h5 # tools/testfiles/vds - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_a.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_b.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_c.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_d.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_e.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_f.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_vds.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_a.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_b.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_c.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_d.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_e.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_vds.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/3_1_vds.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/3_2_vds.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/4_0.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/4_1.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/4_2.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/4_vds.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/5_a.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/5_b.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/5_c.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/5_vds.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/1_a.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/1_b.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/1_c.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/1_d.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/1_e.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/1_f.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/1_vds.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/2_a.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/2_b.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/2_c.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/2_d.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/2_e.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/2_vds.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/3_1_vds.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/3_2_vds.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/4_0.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/4_1.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/4_2.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/4_vds.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/5_a.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/5_b.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/5_c.h5 + ${HDF5_TOOLS_DIR}/testfiles/vds/5_vds.h5 ) set (LIST_OTHER_TEST_FILES diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt index be08e2a..7b32e8b 100644 --- a/tools/h5dump/CMakeLists.txt +++ b/tools/h5dump/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_H5DUMP) #----------------------------------------------------------------------------- # Setup include Directories #----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib) +INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib) # -------------------------------------------------------------------- # Add the h5dump executables diff --git a/tools/h5dump/CMakeTests.cmake b/tools/h5dump/CMakeTests.cmake index 7897311..346ab60 100644 --- a/tools/h5dump/CMakeTests.cmake +++ b/tools/h5dump/CMakeTests.cmake @@ -9,177 +9,177 @@ # Copy all the HDF5 files from the test directory into the source directory # -------------------------------------------------------------------- set (HDF5_REFERENCE_FILES - ${HDF5_TOOLS_SRC_DIR}/testfiles/charsets.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/file_space.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/filter_fail.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/non_existing.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/packedbits.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-2A.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-2A0.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-2B.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-3.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-4s.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-5s.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-6.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-7.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-7N.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tallfilters.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1_big.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray3.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray4.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray5.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray6.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray7.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray8.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr-1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr-2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr-3.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr-4_be.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrcontents1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrcontents2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrintsize.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrreg.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrregR.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tbin1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tbin1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tbin2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tbin3.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tbin4.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tbinregR.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tbigdims.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tbitnopaque.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tboot1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tboot2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tboot2A.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tboot2B.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tchar1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tchunked.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdattrintsize.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdintarray.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdints.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdintsize.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcomp-1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcomp-2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcomp-3.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcomp-4.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompact.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcontents.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcontiguos.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdatareg.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdataregR.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdeflate.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset-1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset-2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset-3s.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/texceedsubstart.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/texceedsubcount.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/texceedsubstride.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/texceedsubblock.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/texternal.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinkfar.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlink.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfill.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfletcher32.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfpformat.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrp_comments.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-3.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-4.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-5.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/thyperslab.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicesno.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicessub1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicessub2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicessub3.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicessub4.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicesyes.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dims.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dimsBlock2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dimsBlockEq.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dimsCount2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dimsCountEq.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dimsStride2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tintsattrs.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tlarge_objname.ddl - #${HDF5_TOOLS_SRC_DIR}/testfiles/tldouble.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tlonglinks.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop-1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tmulti.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tmultifile.ddl - #${HDF5_TOOLS_SRC_DIR}/testfiles/tqmarkfile.ddl - #${HDF5_TOOLS_SRC_DIR}/testfiles/tstarfile.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnamed_dtype_attr.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcmpddt.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnbit.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnoattrdata.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnoattrddl.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnodata.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnoddl.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnoddlfile.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tno-subset.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnullspace.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tordergr1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tordergr2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tordergr3.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tordergr4.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tordergr5.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr3.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr4.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tordercontents1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tordercontents2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/torderlinks1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/torderlinks2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tperror.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/trawdatafile.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/trawssetfile.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/treadfilter.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/treadintfilter.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/treference.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsaf.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarattrintsize.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarintattrsize.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarintsize.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarstring.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tscaleoffset.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tshuffle.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink-1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink-2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink-D.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsplit_file.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr-1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr-2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstring.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstring2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstringe.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tszip.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tudlink-1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tudlink-2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tuserfilter.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes1.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes2.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes3.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes4.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes5.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvlstr.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvms.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/twidedisplay.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/twithddlfile.ddl - ${HDF5_TOOLS_SRC_DIR}/testfiles/h5dump-help.txt - ${HDF5_TOOLS_SRC_DIR}/testfiles/out3.h5import - ${HDF5_TOOLS_SRC_DIR}/testfiles/zerodim.ddl + ${HDF5_TOOLS_DIR}/testfiles/charsets.ddl + ${HDF5_TOOLS_DIR}/testfiles/file_space.ddl + ${HDF5_TOOLS_DIR}/testfiles/filter_fail.ddl + ${HDF5_TOOLS_DIR}/testfiles/non_existing.ddl + ${HDF5_TOOLS_DIR}/testfiles/packedbits.ddl + ${HDF5_TOOLS_DIR}/testfiles/tall-1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tall-2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tall-2A.ddl + ${HDF5_TOOLS_DIR}/testfiles/tall-2A0.ddl + ${HDF5_TOOLS_DIR}/testfiles/tall-2B.ddl + ${HDF5_TOOLS_DIR}/testfiles/tall-3.ddl + ${HDF5_TOOLS_DIR}/testfiles/tall-4s.ddl + ${HDF5_TOOLS_DIR}/testfiles/tall-5s.ddl + ${HDF5_TOOLS_DIR}/testfiles/tall-6.ddl + ${HDF5_TOOLS_DIR}/testfiles/tall-7.ddl + ${HDF5_TOOLS_DIR}/testfiles/tall-7N.ddl + ${HDF5_TOOLS_DIR}/testfiles/tallfilters.ddl + ${HDF5_TOOLS_DIR}/testfiles/tarray1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tarray1_big.ddl + ${HDF5_TOOLS_DIR}/testfiles/tarray2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tarray3.ddl + ${HDF5_TOOLS_DIR}/testfiles/tarray4.ddl + ${HDF5_TOOLS_DIR}/testfiles/tarray5.ddl + ${HDF5_TOOLS_DIR}/testfiles/tarray6.ddl + ${HDF5_TOOLS_DIR}/testfiles/tarray7.ddl + ${HDF5_TOOLS_DIR}/testfiles/tarray8.ddl + ${HDF5_TOOLS_DIR}/testfiles/tattr-1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tattr-2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tattr-3.ddl + ${HDF5_TOOLS_DIR}/testfiles/tattr-4_be.ddl + ${HDF5_TOOLS_DIR}/testfiles/tattrcontents1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tattrcontents2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tattrintsize.ddl + ${HDF5_TOOLS_DIR}/testfiles/tattrreg.ddl + ${HDF5_TOOLS_DIR}/testfiles/tattrregR.ddl + ${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tbin2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tbin3.ddl + ${HDF5_TOOLS_DIR}/testfiles/tbin4.ddl + ${HDF5_TOOLS_DIR}/testfiles/tbinregR.ddl + ${HDF5_TOOLS_DIR}/testfiles/tbigdims.ddl + ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque.ddl + ${HDF5_TOOLS_DIR}/testfiles/tboot1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tboot2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tboot2A.ddl + ${HDF5_TOOLS_DIR}/testfiles/tboot2B.ddl + ${HDF5_TOOLS_DIR}/testfiles/tchar1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tchunked.ddl + ${HDF5_TOOLS_DIR}/testfiles/tcmpdattrintsize.ddl + ${HDF5_TOOLS_DIR}/testfiles/tcmpdintarray.ddl + ${HDF5_TOOLS_DIR}/testfiles/tcmpdints.ddl + ${HDF5_TOOLS_DIR}/testfiles/tcmpdintsize.ddl + ${HDF5_TOOLS_DIR}/testfiles/tcomp-1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tcomp-2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tcomp-3.ddl + ${HDF5_TOOLS_DIR}/testfiles/tcomp-4.ddl + ${HDF5_TOOLS_DIR}/testfiles/tcompact.ddl + ${HDF5_TOOLS_DIR}/testfiles/tcontents.ddl + ${HDF5_TOOLS_DIR}/testfiles/tcontiguos.ddl + ${HDF5_TOOLS_DIR}/testfiles/tdatareg.ddl + ${HDF5_TOOLS_DIR}/testfiles/tdataregR.ddl + ${HDF5_TOOLS_DIR}/testfiles/tdeflate.ddl + ${HDF5_TOOLS_DIR}/testfiles/tdset-1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tdset-2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tdset-3s.ddl + ${HDF5_TOOLS_DIR}/testfiles/tempty.ddl + ${HDF5_TOOLS_DIR}/testfiles/texceedsubstart.ddl + ${HDF5_TOOLS_DIR}/testfiles/texceedsubcount.ddl + ${HDF5_TOOLS_DIR}/testfiles/texceedsubstride.ddl + ${HDF5_TOOLS_DIR}/testfiles/texceedsubblock.ddl + ${HDF5_TOOLS_DIR}/testfiles/texternal.ddl + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.ddl + ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.ddl + ${HDF5_TOOLS_DIR}/testfiles/textlink.ddl + ${HDF5_TOOLS_DIR}/testfiles/tfamily.ddl + ${HDF5_TOOLS_DIR}/testfiles/tfill.ddl + ${HDF5_TOOLS_DIR}/testfiles/tfletcher32.ddl + ${HDF5_TOOLS_DIR}/testfiles/tfpformat.ddl + ${HDF5_TOOLS_DIR}/testfiles/tgroup-1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tgroup-2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.ddl + ${HDF5_TOOLS_DIR}/testfiles/thlink-1.ddl + ${HDF5_TOOLS_DIR}/testfiles/thlink-2.ddl + ${HDF5_TOOLS_DIR}/testfiles/thlink-3.ddl + ${HDF5_TOOLS_DIR}/testfiles/thlink-4.ddl + ${HDF5_TOOLS_DIR}/testfiles/thlink-5.ddl + ${HDF5_TOOLS_DIR}/testfiles/thyperslab.ddl + ${HDF5_TOOLS_DIR}/testfiles/tindicesno.ddl + ${HDF5_TOOLS_DIR}/testfiles/tindicessub1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tindicessub2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tindicessub3.ddl + ${HDF5_TOOLS_DIR}/testfiles/tindicessub4.ddl + ${HDF5_TOOLS_DIR}/testfiles/tindicesyes.ddl + ${HDF5_TOOLS_DIR}/testfiles/tints4dims.ddl + ${HDF5_TOOLS_DIR}/testfiles/tints4dimsBlock2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tints4dimsBlockEq.ddl + ${HDF5_TOOLS_DIR}/testfiles/tints4dimsCount2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tints4dimsCountEq.ddl + ${HDF5_TOOLS_DIR}/testfiles/tints4dimsStride2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tintsattrs.ddl + ${HDF5_TOOLS_DIR}/testfiles/tlarge_objname.ddl + #${HDF5_TOOLS_DIR}/testfiles/tldouble.ddl + ${HDF5_TOOLS_DIR}/testfiles/tlonglinks.ddl + ${HDF5_TOOLS_DIR}/testfiles/tloop-1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tmulti.ddl + ${HDF5_TOOLS_DIR}/testfiles/tmultifile.ddl + #${HDF5_TOOLS_DIR}/testfiles/tqmarkfile.ddl + #${HDF5_TOOLS_DIR}/testfiles/tstarfile.ddl + ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.ddl + ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tnestedcmpddt.ddl + ${HDF5_TOOLS_DIR}/testfiles/tnbit.ddl + ${HDF5_TOOLS_DIR}/testfiles/tnoattrdata.ddl + ${HDF5_TOOLS_DIR}/testfiles/tnoattrddl.ddl + ${HDF5_TOOLS_DIR}/testfiles/tnodata.ddl + ${HDF5_TOOLS_DIR}/testfiles/tnoddl.ddl + ${HDF5_TOOLS_DIR}/testfiles/tnoddlfile.ddl + ${HDF5_TOOLS_DIR}/testfiles/tno-subset.ddl + ${HDF5_TOOLS_DIR}/testfiles/tnullspace.ddl + ${HDF5_TOOLS_DIR}/testfiles/tordergr1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tordergr2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tordergr3.ddl + ${HDF5_TOOLS_DIR}/testfiles/tordergr4.ddl + ${HDF5_TOOLS_DIR}/testfiles/tordergr5.ddl + ${HDF5_TOOLS_DIR}/testfiles/torderattr1.ddl + ${HDF5_TOOLS_DIR}/testfiles/torderattr2.ddl + ${HDF5_TOOLS_DIR}/testfiles/torderattr3.ddl + ${HDF5_TOOLS_DIR}/testfiles/torderattr4.ddl + ${HDF5_TOOLS_DIR}/testfiles/tordercontents1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tordercontents2.ddl + ${HDF5_TOOLS_DIR}/testfiles/torderlinks1.ddl + ${HDF5_TOOLS_DIR}/testfiles/torderlinks2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tperror.ddl + ${HDF5_TOOLS_DIR}/testfiles/trawdatafile.ddl + ${HDF5_TOOLS_DIR}/testfiles/trawssetfile.ddl + ${HDF5_TOOLS_DIR}/testfiles/treadfilter.ddl + ${HDF5_TOOLS_DIR}/testfiles/treadintfilter.ddl + ${HDF5_TOOLS_DIR}/testfiles/treference.ddl + ${HDF5_TOOLS_DIR}/testfiles/tsaf.ddl + ${HDF5_TOOLS_DIR}/testfiles/tscalarattrintsize.ddl + ${HDF5_TOOLS_DIR}/testfiles/tscalarintattrsize.ddl + ${HDF5_TOOLS_DIR}/testfiles/tscalarintsize.ddl + ${HDF5_TOOLS_DIR}/testfiles/tscalarstring.ddl + ${HDF5_TOOLS_DIR}/testfiles/tscaleoffset.ddl + ${HDF5_TOOLS_DIR}/testfiles/tshuffle.ddl + ${HDF5_TOOLS_DIR}/testfiles/tslink-1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tslink-2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tslink-D.ddl + ${HDF5_TOOLS_DIR}/testfiles/tsplit_file.ddl + ${HDF5_TOOLS_DIR}/testfiles/tstr-1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tstr-2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tstring.ddl + ${HDF5_TOOLS_DIR}/testfiles/tstring2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tstringe.ddl + ${HDF5_TOOLS_DIR}/testfiles/tszip.ddl + ${HDF5_TOOLS_DIR}/testfiles/tudlink-1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tudlink-2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tuserfilter.ddl + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.ddl + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.ddl + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.ddl + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.ddl + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.ddl + ${HDF5_TOOLS_DIR}/testfiles/tvlstr.ddl + ${HDF5_TOOLS_DIR}/testfiles/tvms.ddl + ${HDF5_TOOLS_DIR}/testfiles/twidedisplay.ddl + ${HDF5_TOOLS_DIR}/testfiles/twithddlfile.ddl + ${HDF5_TOOLS_DIR}/testfiles/h5dump-help.txt + ${HDF5_TOOLS_DIR}/testfiles/out3.h5import + ${HDF5_TOOLS_DIR}/testfiles/zerodim.ddl ) set (HDF5_REFERENCE_EXP_FILES tall-6.exp @@ -192,103 +192,103 @@ twithddlfile.exp ) set (HDF5_REFERENCE_TEST_FILES - ${HDF5_TOOLS_SRC_DIR}/testfiles/charsets.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/file_space.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/filter_fail.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/packedbits.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/taindices.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1_big.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray2.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray3.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray4.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray5.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray6.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray7.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray8.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr2.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr4_be.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrintsize.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrreg.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tbigdims.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tbinary.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tbitnopaque.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tchar.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdattrintsize.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdintarray.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdints.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdintsize.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound_complex.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdatareg.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinkfar.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinktar.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlink.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00000.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00001.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00002.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00003.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00004.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00005.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00006.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00007.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00008.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00009.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00010.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfcontents1.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfcontents2.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfilters.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfpformat.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfvalues.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrp_comments.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/thyperslab.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dims.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tintsattrs.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tlarge_objname.h5 - #${HDF5_TOOLS_SRC_DIR}/testfiles/tldouble.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tlonglinks.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tmulti-b.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tmulti-g.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tmulti-l.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tmulti-o.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tmulti-r.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tmulti-s.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnamed_dtype_attr.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcomp.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcmpddt.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tno-subset.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnullspace.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tordergr.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsaf.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarattrintsize.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarintattrsize.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarintsize.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarstring.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsplit_file-m.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsplit_file-r.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr2.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr3.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tudlink.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes1.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes2.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes3.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes4.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes5.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvlstr.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvms.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/zerodim.h5 + ${HDF5_TOOLS_DIR}/testfiles/charsets.h5 + ${HDF5_TOOLS_DIR}/testfiles/file_space.h5 + ${HDF5_TOOLS_DIR}/testfiles/filter_fail.h5 + ${HDF5_TOOLS_DIR}/testfiles/packedbits.h5 + ${HDF5_TOOLS_DIR}/testfiles/taindices.h5 + ${HDF5_TOOLS_DIR}/testfiles/tall.h5 + ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5 + ${HDF5_TOOLS_DIR}/testfiles/tarray1_big.h5 + ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5 + ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5 + ${HDF5_TOOLS_DIR}/testfiles/tarray4.h5 + ${HDF5_TOOLS_DIR}/testfiles/tarray5.h5 + ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5 + ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5 + ${HDF5_TOOLS_DIR}/testfiles/tarray8.h5 + ${HDF5_TOOLS_DIR}/testfiles/tattr.h5 + ${HDF5_TOOLS_DIR}/testfiles/tattr2.h5 + ${HDF5_TOOLS_DIR}/testfiles/tattr4_be.h5 + ${HDF5_TOOLS_DIR}/testfiles/tattrintsize.h5 + ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5 + ${HDF5_TOOLS_DIR}/testfiles/tbigdims.h5 + ${HDF5_TOOLS_DIR}/testfiles/tbinary.h5 + ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque.h5 + ${HDF5_TOOLS_DIR}/testfiles/tchar.h5 + ${HDF5_TOOLS_DIR}/testfiles/tcmpdattrintsize.h5 + ${HDF5_TOOLS_DIR}/testfiles/tcmpdintarray.h5 + ${HDF5_TOOLS_DIR}/testfiles/tcmpdints.h5 + ${HDF5_TOOLS_DIR}/testfiles/tcmpdintsize.h5 + ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5 + ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5 + ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5 + ${HDF5_TOOLS_DIR}/testfiles/tdset.h5 + ${HDF5_TOOLS_DIR}/testfiles/tempty.h5 + ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5 + ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.h5 + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5 + ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5 + ${HDF5_TOOLS_DIR}/testfiles/textlink.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfamily00000.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfamily00001.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfamily00002.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfamily00003.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfamily00004.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfamily00005.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfamily00006.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfamily00007.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfamily00008.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfamily00009.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfamily00010.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfcontents1.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfcontents2.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfilters.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfvalues.h5 + ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5 + ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.h5 + ${HDF5_TOOLS_DIR}/testfiles/thlink.h5 + ${HDF5_TOOLS_DIR}/testfiles/thyperslab.h5 + ${HDF5_TOOLS_DIR}/testfiles/tints4dims.h5 + ${HDF5_TOOLS_DIR}/testfiles/tintsattrs.h5 + ${HDF5_TOOLS_DIR}/testfiles/tlarge_objname.h5 + #${HDF5_TOOLS_DIR}/testfiles/tldouble.h5 + ${HDF5_TOOLS_DIR}/testfiles/tlonglinks.h5 + ${HDF5_TOOLS_DIR}/testfiles/tloop.h5 + ${HDF5_TOOLS_DIR}/testfiles/tmulti-b.h5 + ${HDF5_TOOLS_DIR}/testfiles/tmulti-g.h5 + ${HDF5_TOOLS_DIR}/testfiles/tmulti-l.h5 + ${HDF5_TOOLS_DIR}/testfiles/tmulti-o.h5 + ${HDF5_TOOLS_DIR}/testfiles/tmulti-r.h5 + ${HDF5_TOOLS_DIR}/testfiles/tmulti-s.h5 + ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5 + ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5 + ${HDF5_TOOLS_DIR}/testfiles/tnestedcmpddt.h5 + ${HDF5_TOOLS_DIR}/testfiles/tno-subset.h5 + ${HDF5_TOOLS_DIR}/testfiles/tnullspace.h5 + ${HDF5_TOOLS_DIR}/testfiles/torderattr.h5 + ${HDF5_TOOLS_DIR}/testfiles/tordergr.h5 + ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5 + ${HDF5_TOOLS_DIR}/testfiles/tscalarattrintsize.h5 + ${HDF5_TOOLS_DIR}/testfiles/tscalarintattrsize.h5 + ${HDF5_TOOLS_DIR}/testfiles/tscalarintsize.h5 + ${HDF5_TOOLS_DIR}/testfiles/tscalarstring.h5 + ${HDF5_TOOLS_DIR}/testfiles/tslink.h5 + ${HDF5_TOOLS_DIR}/testfiles/tsplit_file-m.h5 + ${HDF5_TOOLS_DIR}/testfiles/tsplit_file-r.h5 + ${HDF5_TOOLS_DIR}/testfiles/tstr.h5 + ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5 + ${HDF5_TOOLS_DIR}/testfiles/tstr3.h5 + ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5 + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5 + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5 + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5 + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5 + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5 + ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5 + ${HDF5_TOOLS_DIR}/testfiles/tvms.h5 + ${HDF5_TOOLS_DIR}/testfiles/zerodim.h5 ) set (HDF5_ERROR_REFERENCE_TEST_FILES ${PROJECT_SOURCE_DIR}/errfiles/filter_fail.err diff --git a/tools/h5dump/CMakeTestsPBITS.cmake b/tools/h5dump/CMakeTestsPBITS.cmake index 745d5b1..14f282a 100644 --- a/tools/h5dump/CMakeTestsPBITS.cmake +++ b/tools/h5dump/CMakeTestsPBITS.cmake @@ -65,9 +65,9 @@ tpbitsUnsignedLongLong16.ddl ) set (HDF5_REFERENCE_TEST_PBITS - ${HDF5_TOOLS_SRC_DIR}/testfiles/packedbits.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound.h5 + ${HDF5_TOOLS_DIR}/testfiles/packedbits.h5 + ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5 + ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5 ) set (HDF5_ERROR_REFERENCE_PBITS tnofilename-with-packed-bits.err diff --git a/tools/h5dump/CMakeTestsXML.cmake b/tools/h5dump/CMakeTestsXML.cmake index fc6cae7..afb1df6 100644 --- a/tools/h5dump/CMakeTestsXML.cmake +++ b/tools/h5dump/CMakeTestsXML.cmake @@ -9,122 +9,122 @@ # copy XML test files from source dir to test dir # set (HDF5_XML_REFERENCE_TEST_FILES - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray2.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray3.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray6.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray7.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tbitfields.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound2.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound_complex.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdatareg.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset2.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tenum.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlink.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfpformat.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop2.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tmany.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-amp.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-apos.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-gt.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-lt.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-quot.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-sp.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnamed_dtype_attr.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcomp.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnodata.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tobjref.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/topaque.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tref.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tref-escapes.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tref-escapes-at.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsaf.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstring.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstring-at.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr2.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tudlink.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes1.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes2.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes3.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes4.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes5.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvlstr.h5 + ${HDF5_TOOLS_DIR}/testfiles/tall.h5 + ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5 + ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5 + ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5 + ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5 + ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5 + ${HDF5_TOOLS_DIR}/testfiles/tattr.h5 + ${HDF5_TOOLS_DIR}/testfiles/tbitfields.h5 + ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5 + ${HDF5_TOOLS_DIR}/testfiles/tcompound2.h5 + ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5 + ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5 + ${HDF5_TOOLS_DIR}/testfiles/tdset.h5 + ${HDF5_TOOLS_DIR}/testfiles/tdset2.h5 + ${HDF5_TOOLS_DIR}/testfiles/tempty.h5 + ${HDF5_TOOLS_DIR}/testfiles/tenum.h5 + ${HDF5_TOOLS_DIR}/testfiles/textlink.h5 + ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5 + ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5 + ${HDF5_TOOLS_DIR}/testfiles/thlink.h5 + ${HDF5_TOOLS_DIR}/testfiles/tloop.h5 + ${HDF5_TOOLS_DIR}/testfiles/tloop2.h5 + ${HDF5_TOOLS_DIR}/testfiles/tmany.h5 + ${HDF5_TOOLS_DIR}/testfiles/tname-amp.h5 + ${HDF5_TOOLS_DIR}/testfiles/tname-apos.h5 + ${HDF5_TOOLS_DIR}/testfiles/tname-gt.h5 + ${HDF5_TOOLS_DIR}/testfiles/tname-lt.h5 + ${HDF5_TOOLS_DIR}/testfiles/tname-quot.h5 + ${HDF5_TOOLS_DIR}/testfiles/tname-sp.h5 + ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5 + ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5 + ${HDF5_TOOLS_DIR}/testfiles/tnodata.h5 + ${HDF5_TOOLS_DIR}/testfiles/tobjref.h5 + ${HDF5_TOOLS_DIR}/testfiles/topaque.h5 + ${HDF5_TOOLS_DIR}/testfiles/torderattr.h5 + ${HDF5_TOOLS_DIR}/testfiles/tref.h5 + ${HDF5_TOOLS_DIR}/testfiles/tref-escapes.h5 + ${HDF5_TOOLS_DIR}/testfiles/tref-escapes-at.h5 + ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5 + ${HDF5_TOOLS_DIR}/testfiles/tslink.h5 + ${HDF5_TOOLS_DIR}/testfiles/tstring.h5 + ${HDF5_TOOLS_DIR}/testfiles/tstring-at.h5 + ${HDF5_TOOLS_DIR}/testfiles/tstr.h5 + ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5 + ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5 + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5 + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5 + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5 + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5 + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5 + ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5 ) set (HDF5_XML_REFERENCE_FILES - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-2A.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray2.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray3.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray6.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray7.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tbitfields.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound_complex.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound2.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdatareg.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset2.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-dtd.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-dtd-2.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-dtd-uri.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-nons.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-nons-2.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-nons-uri.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-ns.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-ns-2.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tenum.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlink.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tfpformat.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop2.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tmany.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-amp.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-apos.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnamed_dtype_attr.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-gt.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-lt.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-quot.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-sp.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcomp.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnodata.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tobjref.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/topaque.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr1.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr2.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr3.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr4.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tref.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tref-escapes.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tref-escapes-at.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsaf.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr2.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstring.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstring-at.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tudlink.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes1.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes2.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes3.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes4.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes5.h5.xml - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvlstr.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tall.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tall-2A.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tattr.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tbitfields.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tcompound2.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tdset.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tdset2.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tempty.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd-2.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd-uri.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tempty-nons.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tempty-nons-2.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tempty-nons-uri.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tempty-ns.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tempty-ns-2.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tenum.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/textlink.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/thlink.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tloop.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tloop2.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tmany.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tname-amp.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tname-apos.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tname-gt.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tname-lt.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tname-quot.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tname-sp.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tnodata.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tobjref.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/topaque.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/torderattr1.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/torderattr2.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/torderattr3.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/torderattr4.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tref.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tref-escapes.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tref-escapes-at.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tslink.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tstr.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tstring.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tstring-at.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5.xml + ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5.xml ) foreach (tst_xml_h5_file ${HDF5_XML_REFERENCE_TEST_FILES}) @@ -138,7 +138,7 @@ ARGS -E copy_if_different ${tst_xml_h5_file} ${dest} ) endforeach (tst_xml_h5_file ${HDF5_XML_REFERENCE_TEST_FILES}) - + foreach (tst_xml_other_file ${HDF5_XML_REFERENCE_FILES}) get_filename_component(fname "${tst_xml_other_file}" NAME) set (dest "${PROJECT_BINARY_DIR}/testfiles/xml/${fname}") @@ -150,7 +150,7 @@ ARGS -E copy_if_different ${tst_xml_other_file} ${dest} ) endforeach (tst_xml_other_file ${HDF5_XML_REFERENCE_FILES}) - + ############################################################################## ############################################################################## ### T H E T E S T S M A C R O S ### @@ -204,16 +204,16 @@ ############################################################################## ############################################################################## -### T H E T E S T S HDF5_ENABLE_USING_MEMCHECKER ### +### T H E T E S T S ### ############################################################################## ############################################################################## - + if (HDF5_ENABLE_USING_MEMCHECKER) # Remove any output file left over from previous test run add_test ( NAME H5DUMP-XML-clearall-objects COMMAND ${CMAKE_COMMAND} - -E remove + -E remove tall.h5.out tall.h5.out.err tall-2A.h5.out @@ -401,7 +401,7 @@ ADD_XML_H5_TEST (tempty.h5 0 tempty.h5) ADD_XML_H5_TEST (tnamed_dtype_attr.h5 0 tnamed_dtype_attr.h5) ##Test dataset and attribute of null space. Commented out: - ## wait until the XML schema is updated for null space. + ## wait until the XML schema is updated for null space. ## ADD_XML_H5_TEST (tnullspace.h5 0 tnulspace.h5) ## So is dataspace with 0 dimension size. ## ADD_XML_H5_TEST (zerodim.h5 0 zerodim.h5) @@ -414,7 +414,7 @@ ADD_XML_H5_TEST (tempty-nons-2.h5 0 --xml-ns=: tempty.h5) ## Some of these combinations are syntactically correct but - ## the URLs are dummies + ## the URLs are dummies ADD_XML_H5_TEST (tempty-ns.h5 0 -X thing: tempty.h5) ADD_XML_H5_TEST (tempty-ns-2.h5 0 --xml-ns=thing: tempty.h5) ADD_XML_H5_TEST (tempty-nons-uri.h5 0 --xml-ns=: --xml-dtd=http://somewhere.net tempty.h5) @@ -431,4 +431,4 @@ # tests for floating point user defined printf format ADD_XML_H5_TEST (tfpformat.h5 0 -u -m %.7f tfpformat.h5) - + diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt index b885a76..7278bbe 100644 --- a/tools/h5import/CMakeLists.txt +++ b/tools/h5import/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_H5IMPORT) #----------------------------------------------------------------------------- # Setup include Directories #----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib) +INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib) # -------------------------------------------------------------------- # Add the h5import executables diff --git a/tools/h5jam/CMakeLists.txt b/tools/h5jam/CMakeLists.txt index c01f8f7..0a9aa6c 100644 --- a/tools/h5jam/CMakeLists.txt +++ b/tools/h5jam/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_H5JAM) #----------------------------------------------------------------------------- # Setup include Directories #----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib) +INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib) # -------------------------------------------------------------------- # Add the h5jam executables diff --git a/tools/h5ls/CMakeLists.txt b/tools/h5ls/CMakeLists.txt index 6e7f00c..b6c0141 100644 --- a/tools/h5ls/CMakeLists.txt +++ b/tools/h5ls/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_H5LS) #----------------------------------------------------------------------------- # Setup include Directories #----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib) +INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib) #----------------------------------------------------------------------------- # Add the h5ls executable diff --git a/tools/h5ls/CMakeTests.cmake b/tools/h5ls/CMakeTests.cmake index c5aff21..d704ffb 100644 --- a/tools/h5ls/CMakeTests.cmake +++ b/tools/h5ls/CMakeTests.cmake @@ -9,87 +9,87 @@ # Copy all the test files from source directory to test directory # -------------------------------------------------------------------- set (LIST_HDF5_TEST_FILES - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr2.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrreg.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdatareg.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlink.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinktar.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrp_comments.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcomp.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsaf.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tudlink.h5 - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes1.h5 + ${HDF5_TOOLS_DIR}/testfiles/tall.h5 + ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5 + ${HDF5_TOOLS_DIR}/testfiles/tattr2.h5 + ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5 + ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5 + ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5 + ${HDF5_TOOLS_DIR}/testfiles/tdset.h5 + ${HDF5_TOOLS_DIR}/testfiles/tempty.h5 + ${HDF5_TOOLS_DIR}/testfiles/textlink.h5 + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5 + ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5 + ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5 + ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.h5 + ${HDF5_TOOLS_DIR}/testfiles/thlink.h5 + ${HDF5_TOOLS_DIR}/testfiles/tloop.h5 + ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5 + ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5 + ${HDF5_TOOLS_DIR}/testfiles/tslink.h5 + ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5 + ${HDF5_TOOLS_DIR}/testfiles/tstr.h5 + ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5 + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5 ) set (LIST_OTHER_TEST_FILES - ${HDF5_TOOLS_SRC_DIR}/testfiles/help-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/help-2.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/help-3.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/nosuchfile.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-2.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr2.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrreg_le.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrreg_be.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tcomp-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdataregbe.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdataregle.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlink-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-2.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-3.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-4.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-5.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-6.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-7.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-1-old.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-2-old.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-3-old.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-6-old.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-7-old.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-2.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-3.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-4.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-5.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-nodangle-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-nodangle-2.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrp_comments.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-nodangle-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/thlinks-nodangle-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-2.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-3.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tmultifile.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-2.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-3.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-4.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tsaf.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tudlink-1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes1.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes2le.ls - ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes2be.ls + ${HDF5_TOOLS_DIR}/testfiles/help-1.ls + ${HDF5_TOOLS_DIR}/testfiles/help-2.ls + ${HDF5_TOOLS_DIR}/testfiles/help-3.ls + ${HDF5_TOOLS_DIR}/testfiles/nosuchfile.ls + ${HDF5_TOOLS_DIR}/testfiles/tall-1.ls + ${HDF5_TOOLS_DIR}/testfiles/tall-2.ls + ${HDF5_TOOLS_DIR}/testfiles/tarray1.ls + ${HDF5_TOOLS_DIR}/testfiles/tattr2.ls + ${HDF5_TOOLS_DIR}/testfiles/tattrreg_le.ls + ${HDF5_TOOLS_DIR}/testfiles/tattrreg_be.ls + ${HDF5_TOOLS_DIR}/testfiles/tcomp-1.ls + ${HDF5_TOOLS_DIR}/testfiles/tdataregbe.ls + ${HDF5_TOOLS_DIR}/testfiles/tdataregle.ls + ${HDF5_TOOLS_DIR}/testfiles/tdset-1.ls + ${HDF5_TOOLS_DIR}/testfiles/tempty.ls + ${HDF5_TOOLS_DIR}/testfiles/textlink-1.ls + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-1.ls + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-2.ls + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-3.ls + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-4.ls + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-5.ls + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-6.ls + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-7.ls + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-1-old.ls + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-2-old.ls + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-3-old.ls + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-6-old.ls + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-7-old.ls + ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-1.ls + ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-2.ls + ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-3.ls + ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-4.ls + ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-5.ls + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-nodangle-1.ls + ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-nodangle-2.ls + ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.ls + ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-nodangle-1.ls + ${HDF5_TOOLS_DIR}/testfiles/thlinks-nodangle-1.ls + ${HDF5_TOOLS_DIR}/testfiles/tgroup.ls + ${HDF5_TOOLS_DIR}/testfiles/tgroup-1.ls + ${HDF5_TOOLS_DIR}/testfiles/tgroup-2.ls + ${HDF5_TOOLS_DIR}/testfiles/tgroup-3.ls + ${HDF5_TOOLS_DIR}/testfiles/thlink-1.ls + ${HDF5_TOOLS_DIR}/testfiles/tloop-1.ls + ${HDF5_TOOLS_DIR}/testfiles/tmultifile.ls + ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-1.ls + ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-2.ls + ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-3.ls + ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-4.ls + ${HDF5_TOOLS_DIR}/testfiles/tsaf.ls + ${HDF5_TOOLS_DIR}/testfiles/tslink-1.ls + ${HDF5_TOOLS_DIR}/testfiles/tstr-1.ls + ${HDF5_TOOLS_DIR}/testfiles/tudlink-1.ls + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.ls + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2le.ls + ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2be.ls ) file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") @@ -107,7 +107,7 @@ ) endforeach (listfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES}) - + ############################################################################## ############################################################################## ### T H E T E S T S M A C R O S ### @@ -157,7 +157,7 @@ add_test ( NAME H5LS-clearall-objects COMMAND ${CMAKE_COMMAND} - -E remove + -E remove help-1.out help-1.out.err help-2.out diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt index d8542a4..dfe9271 100644 --- a/tools/h5repack/CMakeLists.txt +++ b/tools/h5repack/CMakeLists.txt @@ -4,13 +4,13 @@ PROJECT (HDF5_TOOLS_H5REPACK) #----------------------------------------------------------------------------- # Setup include Directories #----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib) +INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib) INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR}) # -------------------------------------------------------------------- # Add h5Repack executables # -------------------------------------------------------------------- -set (REPACK_COMMON_SRCS +set (REPACK_COMMON_SOURCES ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_copy.c ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_filters.c ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_opttable.c @@ -20,7 +20,7 @@ set (REPACK_COMMON_SRCS ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack.c ) -add_executable (h5repack ${REPACK_COMMON_SRCS} ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_main.c) +add_executable (h5repack ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_main.c) TARGET_NAMING (h5repack STATIC) TARGET_C_PROPERTIES (h5repack STATIC " " " ") target_link_libraries (h5repack ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) @@ -38,7 +38,7 @@ if (BUILD_TESTING) target_link_libraries (testh5repack_detect_szip ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) set_target_properties (testh5repack_detect_szip PROPERTIES FOLDER tools) - add_executable (h5repacktest ${REPACK_COMMON_SRCS} ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repacktst.c) + add_executable (h5repacktest ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repacktst.c) TARGET_NAMING (h5repacktest STATIC) TARGET_C_PROPERTIES (h5repacktest STATIC " " " ") target_link_libraries (h5repacktest ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) diff --git a/tools/h5stat/CMakeLists.txt b/tools/h5stat/CMakeLists.txt index 71c4741..f537ce6 100644 --- a/tools/h5stat/CMakeLists.txt +++ b/tools/h5stat/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_H5STAT) #----------------------------------------------------------------------------- # Setup include Directories #----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib) +INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib) # -------------------------------------------------------------------- # Add the h5stat executables diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt index ce1ad34..33c6b02 100644 --- a/tools/lib/CMakeLists.txt +++ b/tools/lib/CMakeLists.txt @@ -10,7 +10,7 @@ add_definitions (${HDF_EXTRA_C_FLAGS}) # Define Sources #----------------------------------------------------------------------------- -set (H5_TOOLS_LIB_SRCS +set (H5_TOOLS_LIB_SOURCES ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff.c ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_array.c ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_attr.c @@ -37,7 +37,7 @@ set (H5_TOOLS_LIB_HDRS ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff.h ) -add_library (${HDF5_TOOLS_LIB_TARGET} STATIC ${H5_TOOLS_LIB_SRCS} ${H5_TOOLS_LIB_HDRS}) +add_library (${HDF5_TOOLS_LIB_TARGET} STATIC ${H5_TOOLS_LIB_SOURCES} ${H5_TOOLS_LIB_HDRS}) TARGET_C_PROPERTIES (${HDF5_TOOLS_LIB_TARGET} STATIC " " " ") target_link_libraries (${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TOOLS_LIB_TARGET}") @@ -50,7 +50,7 @@ set_target_properties (${HDF5_TOOLS_LIB_TARGET} PROPERTIES set (install_targets ${HDF5_TOOLS_LIB_TARGET}) if (BUILD_SHARED_LIBS) - add_library (${HDF5_TOOLS_LIBSH_TARGET} SHARED ${H5_TOOLS_LIB_SRCS} ${H5_TOOLS_LIB_HDRS}) + add_library (${HDF5_TOOLS_LIBSH_TARGET} SHARED ${H5_TOOLS_LIB_SOURCES} ${H5_TOOLS_LIB_HDRS}) TARGET_C_PROPERTIES (${HDF5_TOOLS_LIBSH_TARGET} SHARED " " " ") target_link_libraries (${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TOOLS_LIBSH_TARGET}") diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt index 088dbdf..2e38fa3 100644 --- a/tools/misc/CMakeLists.txt +++ b/tools/misc/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_MISC) #----------------------------------------------------------------------------- # Setup include Directories #----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib) +INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib) # -------------------------------------------------------------------- # Add the misc executables diff --git a/tools/perform/CMakeLists.txt b/tools/perform/CMakeLists.txt index 3a60a84..0a38b21 100644 --- a/tools/perform/CMakeLists.txt +++ b/tools/perform/CMakeLists.txt @@ -10,17 +10,17 @@ add_definitions (${HDF_EXTRA_C_FLAGS}) # Setup include Directories #----------------------------------------------------------------------------- INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR}) -INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib ) +INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib ) # -------------------------------------------------------------------- # Add the executables # -------------------------------------------------------------------- #-- Adding test for h5perf_serial -set (h5perf_serial_SRCS +set (h5perf_serial_SOURCES ${HDF5_PERFORM_SOURCE_DIR}/sio_perf.c ${HDF5_PERFORM_SOURCE_DIR}/sio_engine.c ) -add_executable (h5perf_serial ${h5perf_serial_SRCS}) +add_executable (h5perf_serial ${h5perf_serial_SOURCES}) TARGET_NAMING (h5perf_serial STATIC) TARGET_C_PROPERTIES (h5perf_serial STATIC " " " ") target_link_libraries (h5perf_serial ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) @@ -28,11 +28,11 @@ set_target_properties (h5perf_serial PROPERTIES FOLDER perform) if (HDF5_BUILD_PERFORM_STANDALONE) #-- Adding test for h5perf_serial_alone - set (h5perf_serial_alone_SRCS + set (h5perf_serial_alone_SOURCES ${HDF5_PERFORM_SOURCE_DIR}/sio_perf.c ${HDF5_PERFORM_SOURCE_DIR}/sio_engine.c ) - add_executable (h5perf_serial_alone ${h5perf_serial_alone_SRCS}) + add_executable (h5perf_serial_alone ${h5perf_serial_alone_SOURCES}) TARGET_NAMING (h5perf_serial_alone STATIC) TARGET_C_PROPERTIES (h5perf_serial_alone STATIC " " " ") target_link_libraries (h5perf_serial_alone ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) @@ -43,30 +43,30 @@ if (HDF5_BUILD_PERFORM_STANDALONE) endif (HDF5_BUILD_PERFORM_STANDALONE) #-- Adding test for chunk -set (chunk_SRCS +set (chunk_SOURCES ${HDF5_PERFORM_SOURCE_DIR}/chunk.c ) -ADD_EXECUTABLE(chunk ${chunk_SRCS}) +ADD_EXECUTABLE(chunk ${chunk_SOURCES}) TARGET_NAMING (chunk STATIC) TARGET_C_PROPERTIES (chunk STATIC " " " ") TARGET_LINK_LIBRARIES(chunk ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) set_target_properties (chunk PROPERTIES FOLDER perform) #-- Adding test for iopipe -set (iopipe_SRCS +set (iopipe_SOURCES ${HDF5_PERFORM_SOURCE_DIR}/iopipe.c ) -add_executable (iopipe ${iopipe_SRCS}) +add_executable (iopipe ${iopipe_SOURCES}) TARGET_NAMING (iopipe STATIC) TARGET_C_PROPERTIES (iopipe STATIC " " " ") target_link_libraries (iopipe ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) set_target_properties (iopipe PROPERTIES FOLDER perform) #-- Adding test for overhead -set (overhead_SRCS +set (overhead_SOURCES ${HDF5_PERFORM_SOURCE_DIR}/overhead.c ) -add_executable (overhead ${overhead_SRCS}) +add_executable (overhead ${overhead_SOURCES}) TARGET_NAMING (overhead STATIC) TARGET_C_PROPERTIES (overhead STATIC " " " ") target_link_libraries (overhead ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) @@ -74,10 +74,10 @@ set_target_properties (overhead PROPERTIES FOLDER perform) if (BUILD_TESTING) #-- Adding test for perf_meta - set (perf_meta_SRCS + set (perf_meta_SOURCES ${HDF5_PERFORM_SOURCE_DIR}/perf_meta.c ) - add_executable (perf_meta ${perf_meta_SRCS}) + add_executable (perf_meta ${perf_meta_SOURCES}) TARGET_NAMING (perf_meta STATIC) TARGET_C_PROPERTIES (perf_meta STATIC " " " ") target_link_libraries (perf_meta ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) @@ -85,10 +85,10 @@ if (BUILD_TESTING) endif (BUILD_TESTING) #-- Adding test for zip_perf -set (zip_perf_SRCS +set (zip_perf_SOURCES ${HDF5_PERFORM_SOURCE_DIR}/zip_perf.c ) -add_executable (zip_perf ${zip_perf_SRCS}) +add_executable (zip_perf ${zip_perf_SOURCES}) TARGET_NAMING (zip_perf STATIC) TARGET_C_PROPERTIES (zip_perf STATIC " " " ") target_link_libraries (zip_perf ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) @@ -96,11 +96,11 @@ set_target_properties (zip_perf PROPERTIES FOLDER perform) if (H5_HAVE_PARALLEL AND BUILD_TESTING) #-- Adding test for h5perf - set (h5perf_SRCS + set (h5perf_SOURCES ${HDF5_PERFORM_SOURCE_DIR}/pio_perf.c ${HDF5_PERFORM_SOURCE_DIR}/pio_engine.c ) - add_executable (h5perf ${h5perf_SRCS}) + add_executable (h5perf ${h5perf_SOURCES}) TARGET_NAMING (h5perf STATIC) TARGET_C_PROPERTIES (h5perf STATIC " " " ") target_link_libraries (h5perf ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) @@ -108,11 +108,11 @@ if (H5_HAVE_PARALLEL AND BUILD_TESTING) if (HDF5_BUILD_PERFORM_STANDALONE) #-- Adding test for h5perf - set (h5perf_alone_SRCS + set (h5perf_alone_SOURCES ${HDF5_PERFORM_SOURCE_DIR}/pio_perf.c ${HDF5_PERFORM_SOURCE_DIR}/pio_engine.c ) - add_executable (h5perf_alone ${h5perf_alone_SRCS}) + add_executable (h5perf_alone ${h5perf_alone_SOURCES}) TARGET_NAMING (h5perf_alone STATIC) TARGET_C_PROPERTIES (h5perf_alone STATIC " " " ") target_link_libraries (h5perf_alone ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) |