mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-24 15:25:00 +08:00
Merge pull request #861 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '601ae0ebbc2b766ebf2662315b3143b0f903d76b': HDFFV-10392 change size of local array to 16 chars HDFFV-10385 rework java names HDFFV-10385 Use OUTPUT_NAME property instead of CMAKE_BUILD_TYPE Revert CMAKE_BUILD_TYPE for matches - need to redesign
This commit is contained in:
Allen Byrne
commit
6a9b816bde
@ -584,7 +584,7 @@ option (HDF5_BUILD_GENERATORS "Build Test Generators" OFF)
|
||||
#-----------------------------------------------------------------------------
|
||||
option (HDF5_ENABLE_TRACE "Enable API tracing capability" OFF)
|
||||
mark_as_advanced (HDF5_ENABLE_TRACE)
|
||||
if (HDF5_BUILD_TYPE MATCHES Debug)
|
||||
if (CMAKE_BUILD_TYPE MATCHES Debug)
|
||||
add_definitions (-DDEBUG)
|
||||
# Enable tracing of the API
|
||||
if (HDF5_ENABLE_TRACE)
|
||||
|
||||
@ -34,7 +34,6 @@ set (tutr_examples
|
||||
|
||||
foreach (example ${examples})
|
||||
add_executable (cpp_ex_${example} ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/${example}.cpp)
|
||||
TARGET_NAMING (cpp_ex_${example} STATIC)
|
||||
TARGET_C_PROPERTIES (cpp_ex_${example} STATIC " " " ")
|
||||
target_link_libraries (cpp_ex_${example} ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (cpp_ex_${example} PROPERTIES FOLDER examples/cpp)
|
||||
@ -42,7 +41,6 @@ endforeach ()
|
||||
|
||||
foreach (example ${tutr_examples})
|
||||
add_executable (cpp_ex_${example} ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/${example}.cpp)
|
||||
TARGET_NAMING (cpp_ex_${example} STATIC)
|
||||
TARGET_C_PROPERTIES (cpp_ex_${example} STATIC " " " ")
|
||||
target_link_libraries (cpp_ex_${example} ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (cpp_ex_${example} PROPERTIES FOLDER examples/cpp)
|
||||
|
||||
@ -37,7 +37,6 @@ 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_SOURCES} )
|
||||
TARGET_NAMING (cpp_testhdf5 STATIC)
|
||||
TARGET_C_PROPERTIES (cpp_testhdf5 STATIC " " " ")
|
||||
target_link_libraries (cpp_testhdf5
|
||||
${HDF5_CPP_LIB_TARGET}
|
||||
|
||||
@ -13,12 +13,12 @@
|
||||
# Compiler specific flags : Shouldn't there be compiler tests for these
|
||||
#-----------------------------------------------------------------------------
|
||||
if (CMAKE_COMPILER_IS_GNUCC)
|
||||
if (HDF5_BUILD_TYPE MATCHES Debug)
|
||||
if (CMAKE_BUILD_TYPE MATCHES Debug)
|
||||
set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99")
|
||||
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
|
||||
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Og -ftrapv -fno-common")
|
||||
endif ()
|
||||
else (HDF5_BUILD_TYPE MATCHES Debug)
|
||||
else ()
|
||||
set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99")
|
||||
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
|
||||
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstdarg-opt")
|
||||
@ -26,7 +26,7 @@ if (CMAKE_COMPILER_IS_GNUCC)
|
||||
endif ()
|
||||
endif ()
|
||||
if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
|
||||
if (HDF5_BUILD_TYPE MATCHES Debug)
|
||||
if (CMAKE_BUILD_TYPE MATCHES Debug)
|
||||
set (CMAKE_CXX_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_CXX_FLAGS}")
|
||||
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
|
||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og -ftrapv -fno-common")
|
||||
|
||||
@ -14,16 +14,22 @@
|
||||
macro (SET_HDF5_BUILD_TYPE)
|
||||
get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
|
||||
if(_isMultiConfig)
|
||||
set(HDF5_CFG_NAME ${CTEST_CONFIGURATION_TYPE})
|
||||
set(HDF5_BUILD_TYPE ${CMAKE_CFG_INTDIR})
|
||||
set(HDF5_CFG_BUILD_TYPE \${CMAKE_INSTALL_CONFIG_NAME})
|
||||
else()
|
||||
set(HDF5_CFG_BUILD_TYPE ".")
|
||||
if(CMAKE_BUILD_TYPE)
|
||||
set(HDF5_CFG_NAME ${CMAKE_BUILD_TYPE})
|
||||
set(HDF5_BUILD_TYPE ${CMAKE_BUILD_TYPE})
|
||||
else()
|
||||
set(HDF5_CFG_NAME "Release")
|
||||
set(HDF5_BUILD_TYPE "Release")
|
||||
endif()
|
||||
endif()
|
||||
if(NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE "Release")
|
||||
endif()
|
||||
endmacro ()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
@ -61,13 +67,6 @@ macro (IDE_SOURCE_PROPERTIES SOURCE_PATH HEADERS SOURCES)
|
||||
#)
|
||||
endmacro ()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
macro (TARGET_NAMING libtarget libtype)
|
||||
if (${libtype} MATCHES "SHARED")
|
||||
set_target_properties (${libtarget} PROPERTIES OUTPUT_NAME "${libtarget}${ARGN}")
|
||||
endif ()
|
||||
endmacro ()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
macro (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent)
|
||||
if (WIN32 AND MSVC)
|
||||
@ -105,6 +104,12 @@ endmacro ()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
|
||||
set (LIB_DEBUG_PREFIX "")
|
||||
if (WIN32)
|
||||
set (LIB_DEBUG_SUFFIX "_D")
|
||||
else ()
|
||||
set (LIB_DEBUG_SUFFIX "_debug")
|
||||
endif ()
|
||||
if (${libtype} MATCHES "SHARED")
|
||||
if (WIN32)
|
||||
set (LIB_RELEASE_NAME "${libname}")
|
||||
@ -115,6 +120,7 @@ macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
|
||||
endif ()
|
||||
else ()
|
||||
if (WIN32)
|
||||
set (LIB_DEBUG_PREFIX "lib")
|
||||
set (LIB_RELEASE_NAME "lib${libname}")
|
||||
set (LIB_DEBUG_NAME "lib${libname}_D")
|
||||
else ()
|
||||
@ -125,11 +131,16 @@ macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
|
||||
|
||||
set_target_properties (${libtarget}
|
||||
PROPERTIES
|
||||
OUTPUT_NAME ${LIB_RELEASE_NAME}
|
||||
OUTPUT_NAME_DEBUG ${LIB_DEBUG_NAME}
|
||||
OUTPUT_NAME_RELEASE ${LIB_RELEASE_NAME}
|
||||
OUTPUT_NAME_MINSIZEREL ${LIB_RELEASE_NAME}
|
||||
OUTPUT_NAME_RELWITHDEBINFO ${LIB_RELEASE_NAME}
|
||||
# OUTPUT_NAME
|
||||
# ${LIB_DEBUG_PREFIX}${libname}$<$<CONFIG:Debug>:${LIB_DEBUG_SUFFIX}>
|
||||
OUTPUT_NAME_DEBUG
|
||||
${LIB_DEBUG_NAME}
|
||||
OUTPUT_NAME_RELEASE
|
||||
${LIB_RELEASE_NAME}
|
||||
OUTPUT_NAME_MINSIZEREL
|
||||
${LIB_RELEASE_NAME}
|
||||
OUTPUT_NAME_RELWITHDEBINFO
|
||||
${LIB_RELEASE_NAME}
|
||||
)
|
||||
if (${libtype} MATCHES "STATIC")
|
||||
if (WIN32)
|
||||
@ -162,7 +173,7 @@ macro (HDF_IMPORT_SET_LIB_OPTIONS libtarget libname libtype libversion)
|
||||
if (${importtype} MATCHES "IMPORT")
|
||||
set (importprefix "${CMAKE_STATIC_LIBRARY_PREFIX}")
|
||||
endif ()
|
||||
if (${HDF5_BUILD_TYPE} MATCHES "Debug")
|
||||
if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
|
||||
set (IMPORT_LIB_NAME ${LIB_DEBUG_NAME})
|
||||
else ()
|
||||
set (IMPORT_LIB_NAME ${LIB_RELEASE_NAME})
|
||||
|
||||
@ -46,13 +46,11 @@ set (examples
|
||||
|
||||
foreach (example ${examples})
|
||||
add_executable (${example} ${HDF5_EXAMPLES_SOURCE_DIR}/${example}.c)
|
||||
TARGET_NAMING (${example} STATIC)
|
||||
TARGET_C_PROPERTIES (${example} STATIC " " " ")
|
||||
target_link_libraries (${example} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (${example} PROPERTIES FOLDER examples)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (${example}-shared ${HDF5_EXAMPLES_SOURCE_DIR}/${example}.c)
|
||||
TARGET_NAMING (${example}-shared SHARED)
|
||||
TARGET_C_PROPERTIES (${example}-shared SHARED " " " ")
|
||||
target_link_libraries (${example}-shared ${HDF5_LIBSH_TARGET})
|
||||
set_target_properties (${example}-shared PROPERTIES FOLDER examples)
|
||||
@ -61,13 +59,11 @@ endforeach ()
|
||||
|
||||
if (H5_HAVE_PARALLEL)
|
||||
add_executable (ph5example ${HDF5_EXAMPLES_SOURCE_DIR}/ph5example.c)
|
||||
TARGET_NAMING (ph5example STATIC)
|
||||
TARGET_C_PROPERTIES (ph5example STATIC " " " ")
|
||||
target_link_libraries (ph5example ${HDF5_LIB_TARGET} ${MPI_C_LIBRARIES})
|
||||
set_target_properties (ph5example PROPERTIES FOLDER examples)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (ph5example-shared ${HDF5_EXAMPLES_SOURCE_DIR}/ph5example.c)
|
||||
TARGET_NAMING (ph5example-shared SHARED)
|
||||
TARGET_C_PROPERTIES (ph5example-shared SHARED " " " ")
|
||||
target_link_libraries (ph5example-shared ${HDF5_LIBSH_TARGET} ${MPI_C_LIBRARIES})
|
||||
set_target_properties (ph5example-shared PROPERTIES FOLDER examples)
|
||||
|
||||
@ -40,7 +40,6 @@ set (F2003_examples
|
||||
|
||||
foreach (example ${examples})
|
||||
add_executable (f90_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
|
||||
TARGET_NAMING (f90_ex_${example} STATIC)
|
||||
TARGET_FORTRAN_PROPERTIES (f90_ex_${example} STATIC " " " ")
|
||||
target_link_libraries (f90_ex_${example}
|
||||
${HDF5_F90_LIB_TARGET}
|
||||
@ -54,7 +53,6 @@ foreach (example ${examples})
|
||||
)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (f90_ex_${example}-shared ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
|
||||
TARGET_NAMING (f90_ex_${example}-shared SHARED)
|
||||
TARGET_FORTRAN_PROPERTIES (f90_ex_${example}-shared SHARED " " " ")
|
||||
target_link_libraries (f90_ex_${example}-shared
|
||||
${HDF5_F90_LIBSH_TARGET}
|
||||
@ -71,7 +69,6 @@ endforeach ()
|
||||
|
||||
foreach (example ${F2003_examples})
|
||||
add_executable (f03_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
|
||||
TARGET_NAMING (f03_ex_${example} STATIC)
|
||||
TARGET_FORTRAN_PROPERTIES (f03_ex_${example} STATIC " " " ")
|
||||
target_link_libraries (f03_ex_${example}
|
||||
${HDF5_F90_LIB_TARGET}
|
||||
@ -85,7 +82,6 @@ foreach (example ${F2003_examples})
|
||||
)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (f03_ex_${example}-shared ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
|
||||
TARGET_NAMING (f03_ex_${example}-shared SHARED)
|
||||
TARGET_FORTRAN_PROPERTIES (f03_ex_${example}-shared SHARED " " " ")
|
||||
target_link_libraries (f03_ex_${example}-shared
|
||||
${HDF5_F90_LIBSH_TARGET}
|
||||
@ -102,7 +98,6 @@ endforeach ()
|
||||
|
||||
if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
|
||||
add_executable (f90_ex_ph5example ${HDF5_F90_EXAMPLES_SOURCE_DIR}/ph5example.f90)
|
||||
TARGET_NAMING (f90_ex_ph5example STATIC)
|
||||
TARGET_FORTRAN_PROPERTIES (f90_ex_ph5example STATIC " " " ")
|
||||
target_link_libraries (f90_ex_ph5example
|
||||
${HDF5_F90_LIB_TARGET}
|
||||
@ -116,7 +111,6 @@ if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
|
||||
)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (f90_ex_ph5example-shared ${HDF5_F90_EXAMPLES_SOURCE_DIR}/ph5example.f90)
|
||||
TARGET_NAMING (f90_ex_ph5example-shared SHARED)
|
||||
TARGET_FORTRAN_PROPERTIES (f90_ex_ph5example-shared SHARED " " " ")
|
||||
target_link_libraries (f90_ex_ph5example-shared
|
||||
${HDF5_F90_LIBSH_TARGET}
|
||||
|
||||
@ -195,7 +195,6 @@ add_executable (testhdf5_fortran
|
||||
tH5Z.F90
|
||||
tHDF5.F90
|
||||
)
|
||||
TARGET_NAMING (testhdf5_fortran STATIC)
|
||||
TARGET_FORTRAN_PROPERTIES (testhdf5_fortran STATIC " " " ")
|
||||
target_link_libraries (testhdf5_fortran
|
||||
${HDF5_F90_TEST_LIB_TARGET}
|
||||
@ -231,7 +230,6 @@ if (BUILD_SHARED_LIBS)
|
||||
tH5Z.F90
|
||||
tHDF5.F90
|
||||
)
|
||||
TARGET_NAMING (testhdf5_fortran-shared SHARED)
|
||||
TARGET_FORTRAN_PROPERTIES (testhdf5_fortran-shared SHARED " " " ")
|
||||
target_link_libraries (testhdf5_fortran-shared
|
||||
${HDF5_F90_TEST_LIBSH_TARGET}
|
||||
@ -259,7 +257,6 @@ add_executable (testhdf5_fortran_1_8
|
||||
tH5MISC_1_8.F90
|
||||
tHDF5_1_8.F90
|
||||
)
|
||||
TARGET_NAMING (testhdf5_fortran_1_8 STATIC)
|
||||
TARGET_FORTRAN_PROPERTIES (testhdf5_fortran_1_8 STATIC " " " ")
|
||||
target_link_libraries (testhdf5_fortran_1_8
|
||||
${HDF5_F90_TEST_LIB_TARGET}
|
||||
@ -286,7 +283,6 @@ if (BUILD_SHARED_LIBS)
|
||||
tH5MISC_1_8.F90
|
||||
tHDF5_1_8.F90
|
||||
)
|
||||
TARGET_NAMING (testhdf5_fortran_1_8-shared SHARED)
|
||||
TARGET_FORTRAN_PROPERTIES (testhdf5_fortran_1_8-shared SHARED " " " ")
|
||||
target_link_libraries (testhdf5_fortran_1_8-shared
|
||||
${HDF5_F90_TEST_LIBSH_TARGET}
|
||||
@ -316,7 +312,6 @@ add_executable (fortranlib_test_F03
|
||||
tH5T_F03.F90
|
||||
tHDF5_F03.F90
|
||||
)
|
||||
TARGET_NAMING (fortranlib_test_F03 STATIC)
|
||||
TARGET_FORTRAN_PROPERTIES (fortranlib_test_F03 STATIC " " " ")
|
||||
target_link_libraries (fortranlib_test_F03
|
||||
${HDF5_F90_TEST_LIB_TARGET}
|
||||
@ -345,7 +340,6 @@ if (BUILD_SHARED_LIBS)
|
||||
tH5T_F03.F90
|
||||
tHDF5_F03.F90
|
||||
)
|
||||
TARGET_NAMING (fortranlib_test_F03-shared SHARED)
|
||||
TARGET_FORTRAN_PROPERTIES (fortranlib_test_F03-shared SHARED " " " ")
|
||||
target_link_libraries (fortranlib_test_F03-shared
|
||||
${HDF5_F90_TEST_LIBSH_TARGET}
|
||||
@ -367,7 +361,6 @@ endif ()
|
||||
|
||||
#-- Adding test for fflush1
|
||||
add_executable (fflush1 fflush1.F90)
|
||||
TARGET_NAMING (fflush1 STATIC)
|
||||
TARGET_FORTRAN_PROPERTIES (fflush1 STATIC " " " ")
|
||||
target_link_libraries (fflush1
|
||||
${HDF5_F90_LIB_TARGET}
|
||||
@ -387,7 +380,6 @@ add_dependencies (fflush1 ${HDF5_F90_TEST_LIB_TARGET})
|
||||
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (fflush1-shared fflush1.F90)
|
||||
TARGET_NAMING (fflush1-shared SHARED)
|
||||
TARGET_FORTRAN_PROPERTIES (fflush1-shared SHARED " " " ")
|
||||
target_link_libraries (fflush1-shared
|
||||
${HDF5_F90_LIBSH_TARGET}
|
||||
@ -408,7 +400,6 @@ endif ()
|
||||
|
||||
#-- Adding test for fflush2
|
||||
add_executable (fflush2 fflush2.F90)
|
||||
TARGET_NAMING (fflush2 STATIC)
|
||||
TARGET_FORTRAN_PROPERTIES (fflush2 STATIC " " " ")
|
||||
target_link_libraries (fflush2
|
||||
${HDF5_F90_TEST_LIB_TARGET}
|
||||
@ -428,7 +419,6 @@ add_dependencies (fflush2 ${HDF5_F90_TEST_LIB_TARGET})
|
||||
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (fflush2-shared fflush2.F90)
|
||||
TARGET_NAMING (fflush2-shared SHARED)
|
||||
TARGET_FORTRAN_PROPERTIES (fflush2-shared SHARED " " " ")
|
||||
target_link_libraries (fflush2-shared
|
||||
${HDF5_F90_TEST_LIBSH_TARGET}
|
||||
|
||||
@ -16,7 +16,6 @@ add_executable (parallel_test
|
||||
hyper.f90
|
||||
mdset.f90
|
||||
)
|
||||
TARGET_NAMING (parallel_test STATIC)
|
||||
TARGET_FORTRAN_PROPERTIES (parallel_test STATIC " " " ")
|
||||
target_link_libraries (parallel_test
|
||||
${HDF5_F90_TEST_LIB_TARGET}
|
||||
|
||||
@ -11,7 +11,6 @@ INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SRC_DIR}/src)
|
||||
# Add in the examples for the Packet Table codes
|
||||
# --------------------------------------------------------------------
|
||||
add_executable (ptExampleFL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleFL.cpp)
|
||||
TARGET_NAMING (ptExampleFL STATIC)
|
||||
TARGET_C_PROPERTIES (ptExampleFL STATIC " " " ")
|
||||
target_link_libraries (
|
||||
ptExampleFL
|
||||
|
||||
@ -17,7 +17,6 @@ INCLUDE_DIRECTORIES (${HDF5_CPP_SRC_DIR}/src)
|
||||
|
||||
add_executable (hl_ptableTest ${HDF5_HL_CPP_TEST_SOURCE_DIR}/ptableTest.cpp)
|
||||
TARGET_C_PROPERTIES (hl_ptableTest STATIC " " " ")
|
||||
TARGET_NAMING (hl_ptableTest STATIC)
|
||||
target_link_libraries (
|
||||
hl_ptableTest
|
||||
${HDF5_LIB_TARGET}
|
||||
|
||||
@ -28,7 +28,6 @@ set (examples
|
||||
|
||||
foreach (example ${examples})
|
||||
add_executable (hl_ex_${example} ${HDF5_HL_EXAMPLES_SOURCE_DIR}/${example}.c)
|
||||
TARGET_NAMING (hl_ex_${example} STATIC)
|
||||
TARGET_C_PROPERTIES (hl_ex_${example} STATIC " " " ")
|
||||
target_link_libraries (hl_ex_${example} ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (hl_ex_${example} PROPERTIES FOLDER examples/hl)
|
||||
|
||||
@ -16,7 +16,6 @@ set (examples
|
||||
|
||||
foreach (example ${examples})
|
||||
add_executable (hl_f90_ex_${example} ${HDF5_HL_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
|
||||
TARGET_NAMING (hl_f90_ex_${example} STATIC)
|
||||
TARGET_FORTRAN_PROPERTIES (hl_f90_ex_${example} STATIC " " " ")
|
||||
target_link_libraries (hl_f90_ex_${example}
|
||||
${HDF5_HL_F90_LIB_TARGET}
|
||||
|
||||
@ -8,7 +8,6 @@ INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${
|
||||
|
||||
#-- Adding test for hl_f90_tstds
|
||||
add_executable (hl_f90_tstds tstds.F90)
|
||||
TARGET_NAMING (hl_f90_tstds STATIC)
|
||||
TARGET_FORTRAN_PROPERTIES (hl_f90_tstds STATIC " " " ")
|
||||
target_link_libraries (hl_f90_tstds ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
|
||||
target_include_directories (hl_f90_tstds PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
|
||||
@ -16,7 +15,6 @@ set_target_properties (hl_f90_tstds PROPERTIES LINKER_LANGUAGE Fortran)
|
||||
set_target_properties (hl_f90_tstds PROPERTIES FOLDER test/hl/fortran)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (hl_f90_tstds-shared tstds.F90)
|
||||
TARGET_NAMING (hl_f90_tstds-shared SHARED)
|
||||
TARGET_FORTRAN_PROPERTIES (hl_f90_tstds-shared SHARED " " " ")
|
||||
target_link_libraries (hl_f90_tstds-shared ${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET})
|
||||
target_include_directories (hl_f90_tstds-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
|
||||
@ -29,7 +27,6 @@ endif ()
|
||||
|
||||
#-- Adding test for hl_f90_tstlite
|
||||
add_executable (hl_f90_tstlite tstlite.F90)
|
||||
TARGET_NAMING (hl_f90_tstlite STATIC)
|
||||
TARGET_FORTRAN_PROPERTIES (hl_f90_tstlite STATIC " " " ")
|
||||
target_link_libraries (hl_f90_tstlite ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_F90_TEST_LIB_TARGET})
|
||||
target_include_directories (hl_f90_tstlite PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
|
||||
@ -37,7 +34,6 @@ set_target_properties (hl_f90_tstlite PROPERTIES LINKER_LANGUAGE Fortran)
|
||||
set_target_properties (hl_f90_tstlite PROPERTIES FOLDER test/hl/fortran)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (hl_f90_tstlite-shared tstlite.F90)
|
||||
TARGET_NAMING (hl_f90_tstlite-shared SHARED)
|
||||
TARGET_FORTRAN_PROPERTIES (hl_f90_tstlite-shared SHARED " " " ")
|
||||
target_link_libraries (hl_f90_tstlite-shared ${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET} ${HDF5_F90_TEST_LIBSH_TARGET})
|
||||
target_include_directories (hl_f90_tstlite-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
|
||||
@ -50,7 +46,6 @@ endif ()
|
||||
|
||||
#-- Adding test for hl_f90_tstimage
|
||||
add_executable (hl_f90_tstimage tstimage.F90)
|
||||
TARGET_NAMING (hl_f90_tstimage STATIC)
|
||||
TARGET_FORTRAN_PROPERTIES (hl_f90_tstimage STATIC " " " ")
|
||||
target_link_libraries (hl_f90_tstimage ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
|
||||
target_include_directories (hl_f90_tstimage PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
|
||||
@ -58,7 +53,6 @@ set_target_properties (hl_f90_tstimage PROPERTIES LINKER_LANGUAGE Fortran)
|
||||
set_target_properties (hl_f90_tstimage PROPERTIES FOLDER test/hl/fortran)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (hl_f90_tstimage-shared tstimage.F90)
|
||||
TARGET_NAMING (hl_f90_tstimage-shared SHARED)
|
||||
TARGET_FORTRAN_PROPERTIES (hl_f90_tstimage-shared SHARED " " " ")
|
||||
target_link_libraries (hl_f90_tstimage-shared ${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET})
|
||||
target_include_directories (hl_f90_tstimage-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
|
||||
@ -71,7 +65,6 @@ endif ()
|
||||
|
||||
#-- Adding test for hl_f90_tsttable
|
||||
add_executable (hl_f90_tsttable tsttable.F90)
|
||||
TARGET_NAMING (hl_f90_tsttable STATIC)
|
||||
TARGET_FORTRAN_PROPERTIES (hl_f90_tsttable STATIC " " " ")
|
||||
target_link_libraries (hl_f90_tsttable ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_F90_TEST_LIB_TARGET})
|
||||
target_include_directories (hl_f90_tsttable PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
|
||||
@ -79,7 +72,6 @@ set_target_properties (hl_f90_tsttable PROPERTIES LINKER_LANGUAGE Fortran)
|
||||
set_target_properties (hl_f90_tsttable PROPERTIES FOLDER test/hl/fortran)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (hl_f90_tsttable-shared tsttable.F90)
|
||||
TARGET_NAMING (hl_f90_tsttable-shared SHARED)
|
||||
TARGET_FORTRAN_PROPERTIES (hl_f90_tsttable-shared SHARED " " " ")
|
||||
target_link_libraries (hl_f90_tsttable-shared ${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET} ${HDF5_F90_TEST_LIBSH_TARGET})
|
||||
target_include_directories (hl_f90_tsttable-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
|
||||
|
||||
@ -22,7 +22,6 @@ include_directories (${HDF5_TEST_SRC_DIR})
|
||||
# --------------------------------------------------------------------
|
||||
MACRO (HL_ADD_EXE hl_name)
|
||||
add_executable (hl_${hl_name} ${hl_name}.c)
|
||||
TARGET_NAMING (hl_${hl_name} STATIC)
|
||||
TARGET_C_PROPERTIES (hl_${hl_name} STATIC " " " ")
|
||||
target_link_libraries (hl_${hl_name}
|
||||
${HDF5_HL_LIB_TARGET}
|
||||
@ -34,7 +33,6 @@ ENDMACRO ()
|
||||
|
||||
MACRO (HL_ADD_SHEXE hl_name)
|
||||
add_executable (hl_${hl_name} ${hl_name}.c)
|
||||
TARGET_NAMING (hl_${hl_name} SHARED)
|
||||
TARGET_C_PROPERTIES (hl_${hl_name} SHARED " " " ")
|
||||
target_link_libraries (hl_${hl_name}
|
||||
${HDF5_HL_LIBSH_TARGET}
|
||||
@ -55,7 +53,6 @@ HL_ADD_EXE (test_dset_append)
|
||||
|
||||
# test_packet has two source files
|
||||
add_executable (hl_test_packet test_packet.c test_packet_vlen.c)
|
||||
TARGET_NAMING (hl_test_packet STATIC)
|
||||
TARGET_C_PROPERTIES (hl_test_packet STATIC " " " ")
|
||||
target_link_libraries (hl_test_packet
|
||||
${HDF5_HL_LIB_TARGET}
|
||||
@ -70,7 +67,6 @@ set_target_properties (hl_test_packet PROPERTIES FOLDER test/hl)
|
||||
# --------------------------------------------------------------------
|
||||
if (HDF5_BUILD_GENERATORS)
|
||||
add_executable (hl_gen_test_ds gen_test_ds.c)
|
||||
TARGET_NAMING (hl_gen_test_ds STATIC)
|
||||
TARGET_C_PROPERTIES (hl_gen_test_ds STATIC " " " ")
|
||||
target_link_libraries (hl_gen_test_ds
|
||||
${HDF5_HL_LIB_TARGET}
|
||||
@ -80,7 +76,6 @@ if (HDF5_BUILD_GENERATORS)
|
||||
set_target_properties (hl_gen_test_ds PROPERTIES FOLDER test/hl/gen)
|
||||
|
||||
add_executable (hl_gen_test_ld gen_test_ld.c)
|
||||
TARGET_NAMING (hl_gen_test_ld STATIC)
|
||||
TARGET_C_PROPERTIES (hl_gen_test_ld STATIC " " " ")
|
||||
target_link_libraries (hl_gen_test_ld
|
||||
${HDF5_HL_LIB_TARGET}
|
||||
|
||||
@ -18,7 +18,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
INCLUDE_DIRECTORIES (${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR})
|
||||
|
||||
add_executable (gif2h5 ${GIF2H5_SOURCES})
|
||||
TARGET_NAMING (gif2h5 STATIC)
|
||||
TARGET_C_PROPERTIES (gif2h5 STATIC " " " ")
|
||||
target_link_libraries (gif2h5 ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
|
||||
set_target_properties (gif2h5 PROPERTIES FOLDER tools/hl)
|
||||
@ -30,7 +29,6 @@ set (hdf2gif_SOURCES
|
||||
${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/hdfgifwr.c
|
||||
)
|
||||
add_executable (h52gif ${hdf2gif_SOURCES})
|
||||
TARGET_NAMING (h52gif STATIC)
|
||||
TARGET_C_PROPERTIES (h52gif STATIC " " " ")
|
||||
target_link_libraries (h52gif ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
|
||||
set_target_properties (h52gif PROPERTIES FOLDER tools/hl)
|
||||
@ -44,7 +42,6 @@ if (BUILD_TESTING)
|
||||
# --------------------------------------------------------------------
|
||||
if (HDF5_BUILD_GENERATORS)
|
||||
add_executable (hl_h52gifgentest ${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/h52gifgentst.c)
|
||||
TARGET_NAMING (hl_h52gifgentest STATIC)
|
||||
TARGET_C_PROPERTIES (hl_h52gifgentest STATIC " " " ")
|
||||
target_link_libraries (hl_h52gifgentest ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (hl_h52gifgentest PROPERTIES FOLDER generator/tools/hl)
|
||||
|
||||
@ -14,7 +14,6 @@ include_directories (${HDF5_HL_TOOLS_DIR}/src)
|
||||
include_directories (${HDF5_HL_TOOLS_H5WATCH_SOURCE_DIR})
|
||||
|
||||
add_executable (h5watch ${H5WATCH_SOURCES})
|
||||
TARGET_NAMING (h5watch STATIC)
|
||||
TARGET_C_PROPERTIES (h5watch STATIC " " " ")
|
||||
target_link_libraries (h5watch ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
|
||||
set_target_properties (h5watch PROPERTIES FOLDER tools/hl)
|
||||
@ -27,7 +26,6 @@ if (BUILD_TESTING)
|
||||
${HDF5_HL_TOOLS_H5WATCH_SOURCE_DIR}/swmr_check_compat_vfd.c
|
||||
)
|
||||
add_executable (hl_swmr_check_compat_vfd ${hl_swmr_check_compat_vfd_SOURCES})
|
||||
TARGET_NAMING (hl_swmr_check_compat_vfd STATIC)
|
||||
TARGET_C_PROPERTIES (hl_swmr_check_compat_vfd STATIC " " " ")
|
||||
target_link_libraries (hl_swmr_check_compat_vfd ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
|
||||
set_target_properties (hl_swmr_check_compat_vfd PROPERTIES FOLDER tools/hl)
|
||||
@ -37,13 +35,11 @@ if (BUILD_TESTING)
|
||||
${HDF5_HL_TOOLS_H5WATCH_SOURCE_DIR}/extend_dset.c
|
||||
)
|
||||
add_executable (extend_dset ${extend_dset_SOURCES})
|
||||
TARGET_NAMING (extend_dset STATIC)
|
||||
TARGET_C_PROPERTIES (extend_dset STATIC " " " ")
|
||||
target_link_libraries (extend_dset ${HDF5_HL_LIB_TARGET} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
|
||||
set_target_properties (extend_dset PROPERTIES FOLDER tools/hl)
|
||||
|
||||
add_executable (h5watchgentest ${HDF5_HL_TOOLS_H5WATCH_SOURCE_DIR}/h5watchgentest.c)
|
||||
TARGET_NAMING (h5watchgentest STATIC)
|
||||
TARGET_C_PROPERTIES (h5watchgentest STATIC " " " ")
|
||||
target_link_libraries (h5watchgentest ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (h5watchgentest PROPERTIES FOLDER generator/tools/hl)
|
||||
|
||||
@ -62,13 +62,7 @@ foreach (HDFJAVA_JAR ${CMAKE_JAVA_INCLUDE_PATH})
|
||||
endforeach ()
|
||||
|
||||
MACRO (ADD_H5_TEST resultfile resultcode)
|
||||
if (HDF5_BUILD_TYPE MATCHES Debug)
|
||||
if (WIN32)
|
||||
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=hdf5_java_D;")
|
||||
else ()
|
||||
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=hdf5_java_debug;")
|
||||
endif ()
|
||||
endif ()
|
||||
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<TARGET_PROPERTY:${HDF5_JAVA_JNI_LIB_TARGET},OUTPUT_NAME$<$<CONFIG:Debug>:_DEBUG>>;")
|
||||
add_test (
|
||||
NAME JAVA_datasets-${resultfile}
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
|
||||
@ -62,13 +62,7 @@ foreach (HDFJAVA_JAR ${CMAKE_JAVA_INCLUDE_PATH})
|
||||
endforeach ()
|
||||
|
||||
MACRO (ADD_H5_TEST resultfile resultcode)
|
||||
if (HDF5_BUILD_TYPE MATCHES Debug)
|
||||
if (WIN32)
|
||||
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=hdf5_java_D;")
|
||||
else ()
|
||||
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=hdf5_java_debug;")
|
||||
endif ()
|
||||
endif ()
|
||||
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<TARGET_PROPERTY:${HDF5_JAVA_JNI_LIB_TARGET},OUTPUT_NAME$<$<CONFIG:Debug>:_DEBUG>>;")
|
||||
add_test (
|
||||
NAME JAVA_datatypes-${resultfile}
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
|
||||
@ -61,13 +61,7 @@ endforeach ()
|
||||
add_custom_target(H5Ex_G_Visit_files ALL COMMENT "Copying files needed by H5Ex_G_Visit tests" DEPENDS ${H5Ex_G_Visit_files_list})
|
||||
|
||||
MACRO (ADD_H5_TEST resultfile resultcode)
|
||||
if (HDF5_BUILD_TYPE MATCHES Debug)
|
||||
if (WIN32)
|
||||
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=hdf5_java_D;")
|
||||
else ()
|
||||
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=hdf5_java_debug;")
|
||||
endif ()
|
||||
endif ()
|
||||
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<TARGET_PROPERTY:${HDF5_JAVA_JNI_LIB_TARGET},OUTPUT_NAME$<$<CONFIG:Debug>:_DEBUG>>;")
|
||||
add_test (
|
||||
NAME JAVA_groups-${resultfile}
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
|
||||
@ -63,13 +63,7 @@ foreach (example ${HDF_JAVA_OBJECT_EXAMPLES})
|
||||
endforeach ()
|
||||
|
||||
MACRO (ADD_H5_TEST resultfile resultcode)
|
||||
if (HDF5_BUILD_TYPE MATCHES Debug)
|
||||
if (WIN32)
|
||||
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=hdf5_java_D;")
|
||||
else ()
|
||||
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=hdf5_java_debug;")
|
||||
endif ()
|
||||
endif ()
|
||||
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<TARGET_PROPERTY:${HDF5_JAVA_JNI_LIB_TARGET},OUTPUT_NAME$<$<CONFIG:Debug>:_DEBUG>>;")
|
||||
add_test (
|
||||
NAME JAVA_intro-${resultfile}
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
|
||||
@ -57,9 +57,7 @@ SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF
|
||||
H5_SET_LIB_OPTIONS (${HDF5_JAVA_JNI_LIB_TARGET} ${HDF5_JAVA_JNI_LIB_NAME} SHARED ${HDF5_JAVA_PACKAGE_SOVERSION})
|
||||
if (WIN32)
|
||||
get_filename_component (HDF5_JAVA_JNI_DLL_NAME ${HDF5_JAVA_JNI_LIB_TARGET} NAME_WE)
|
||||
if (HDF5_BUILD_TYPE MATCHES Debug)
|
||||
set (HDF5_JAVA_JNI_DLL_NAME "${HDF5_JAVA_JNI_DLL_NAME}_D")
|
||||
endif ()
|
||||
set (HDF5_JAVA_JNI_DLL_NAME "${HDF5_JAVA_JNI_DLL_NAME}$<$<CONFIG:Debug>:_D>")
|
||||
# message (STATUS "HDF5_JAVA_JNI_DLL_NAME: ${HDF5_JAVA_JNI_DLL_NAME}")
|
||||
if (BUILD_TESTING)
|
||||
add_custom_target (HDF5_JAVA_JNI-Test-Copy ALL
|
||||
|
||||
@ -88,14 +88,7 @@ endforeach ()
|
||||
set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${HDF5_JAVA_TEST_LIB_TARGET}_JAR_FILE}")
|
||||
set (testfilter "OK (598 tests)")
|
||||
|
||||
if (HDF5_BUILD_TYPE MATCHES Debug)
|
||||
if (WIN32)
|
||||
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=hdf5_java_D;")
|
||||
else ()
|
||||
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=hdf5_java_debug;")
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<TARGET_PROPERTY:${HDF5_JAVA_JNI_LIB_TARGET},OUTPUT_NAME$<$<CONFIG:Debug>:_DEBUG>>;")
|
||||
add_test (
|
||||
NAME JUnit-interface-clearall-objects
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
|
||||
@ -37,7 +37,7 @@ I. Preconditions
|
||||
|
||||
1. We suggest you obtain the latest CMake for windows from the Kitware
|
||||
web site. The HDF5 1.10.x product requires a minimum CMake version
|
||||
of 3.2.2.
|
||||
of 3.10.1.
|
||||
|
||||
2. You have installed the HDF5 library built with CMake, by executing
|
||||
the HDF Install Utility (the *.msi file in the binary package for
|
||||
@ -101,10 +101,10 @@ These steps are described in more detail below.
|
||||
* Unix Makefiles
|
||||
* Visual Studio 12 2013
|
||||
* Visual Studio 12 2013 Win64
|
||||
* Visual Studio 11 2012
|
||||
* Visual Studio 11 2012 Win64
|
||||
* Visual Studio 14 2015
|
||||
* Visual Studio 14 2015 Win64
|
||||
* Visual Studio 15 2017
|
||||
* Visual Studio 15 2017 Win64
|
||||
|
||||
<options> is:
|
||||
* BUILD_TESTING:BOOL=ON
|
||||
@ -180,7 +180,7 @@ Given the preconditions in section I, create a CMakeLists.txt file at the
|
||||
source root. Include the following text in the file:
|
||||
|
||||
##########################################################
|
||||
cmake_minimum_required (VERSION 3.2.2)
|
||||
cmake_minimum_required (VERSION 3.10.1)
|
||||
project (HDF5MyApp C CXX)
|
||||
|
||||
set (LIB_TYPE STATIC) # or SHARED
|
||||
@ -194,7 +194,6 @@ set (LINK_LIBS ${LINK_LIBS} ${HDF5_C_${LIB_TYPE}_LIBRARY})
|
||||
set (example hdf_example)
|
||||
|
||||
add_executable (${example} ${PROJECT_SOURCE_DIR}/${example}.c)
|
||||
TARGET_NAMING (${example} ${LIB_TYPE})
|
||||
TARGET_C_PROPERTIES (${example} ${LIB_TYPE} " " " ")
|
||||
target_link_libraries (${example} ${LINK_LIBS})
|
||||
|
||||
|
||||
@ -172,13 +172,11 @@ set (testhdf5_SOURCES
|
||||
|
||||
#-- Adding test for testhdf5
|
||||
add_executable (testhdf5 ${testhdf5_SOURCES})
|
||||
TARGET_NAMING (testhdf5 STATIC)
|
||||
TARGET_C_PROPERTIES (testhdf5 STATIC " " " ")
|
||||
target_link_libraries (testhdf5 ${HDF5_TEST_LIB_TARGET})
|
||||
set_target_properties (testhdf5 PROPERTIES FOLDER test)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (testhdf5-shared ${testhdf5_SOURCES})
|
||||
TARGET_NAMING (testhdf5-shared SHARED)
|
||||
TARGET_C_PROPERTIES (testhdf5-shared SHARED " " " ")
|
||||
target_link_libraries (testhdf5-shared PUBLIC ${HDF5_TEST_LIBSH_TARGET})
|
||||
set_target_properties (testhdf5-shared PROPERTIES FOLDER test)
|
||||
@ -186,13 +184,11 @@ endif ()
|
||||
|
||||
MACRO (ADD_H5_EXE file)
|
||||
add_executable (${file} ${HDF5_TEST_SOURCE_DIR}/${file}.c)
|
||||
TARGET_NAMING (${file} STATIC)
|
||||
TARGET_C_PROPERTIES (${file} STATIC " " " ")
|
||||
target_link_libraries (${file} PUBLIC ${HDF5_TEST_LIB_TARGET})
|
||||
set_target_properties (${file} PROPERTIES FOLDER test)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (${file}-shared ${HDF5_TEST_SOURCE_DIR}/${file}.c)
|
||||
TARGET_NAMING (${file}-shared SHARED)
|
||||
TARGET_C_PROPERTIES (${file}-shared SHARED " " " ")
|
||||
target_link_libraries (${file}-shared PUBLIC ${HDF5_TEST_LIBSH_TARGET})
|
||||
set_target_properties (${file}-shared PROPERTIES FOLDER test)
|
||||
@ -299,7 +295,6 @@ add_executable (cache_image
|
||||
${HDF5_TEST_SOURCE_DIR}/cache_image.c
|
||||
${HDF5_TEST_SOURCE_DIR}/genall5.c
|
||||
)
|
||||
TARGET_NAMING (cache_image STATIC)
|
||||
TARGET_C_PROPERTIES (cache_image STATIC " " " ")
|
||||
target_link_libraries (cache_image ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
|
||||
set_target_properties (cache_image PROPERTIES FOLDER test)
|
||||
@ -308,7 +303,6 @@ if (BUILD_SHARED_LIBS)
|
||||
${HDF5_TEST_SOURCE_DIR}/cache_image.c
|
||||
${HDF5_TEST_SOURCE_DIR}/genall5.c
|
||||
)
|
||||
TARGET_NAMING (cache_image-shared SHARED)
|
||||
TARGET_C_PROPERTIES (cache_image-shared SHARED " " " ")
|
||||
target_link_libraries (cache_image-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
|
||||
set_target_properties (cache_image-shared PROPERTIES FOLDER test)
|
||||
@ -316,13 +310,11 @@ endif ()
|
||||
|
||||
#-- Adding test for hyperslab
|
||||
add_executable (hyperslab ${HDF5_TEST_SOURCE_DIR}/hyperslab.c)
|
||||
TARGET_NAMING (hyperslab STATIC)
|
||||
TARGET_C_PROPERTIES (hyperslab STATIC " " " ")
|
||||
target_link_libraries (hyperslab ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
|
||||
set_target_properties (hyperslab PROPERTIES FOLDER test)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (hyperslab-shared ${HDF5_TEST_SOURCE_DIR}/hyperslab.c)
|
||||
TARGET_NAMING (hyperslab-shared SHARED)
|
||||
TARGET_C_PROPERTIES (hyperslab-shared SHARED " " " ")
|
||||
target_link_libraries (hyperslab-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
|
||||
set_target_properties (hyperslab-shared PROPERTIES FOLDER test)
|
||||
@ -342,7 +334,6 @@ add_executable (ttsafe
|
||||
${HDF5_TEST_SOURCE_DIR}/ttsafe_cancel.c
|
||||
${HDF5_TEST_SOURCE_DIR}/ttsafe_acreate.c
|
||||
)
|
||||
TARGET_NAMING (ttsafe STATIC)
|
||||
TARGET_C_PROPERTIES (ttsafe STATIC " " " ")
|
||||
target_link_libraries (ttsafe ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
|
||||
set_target_properties (ttsafe PROPERTIES FOLDER test)
|
||||
@ -354,7 +345,6 @@ if (BUILD_SHARED_LIBS)
|
||||
${HDF5_TEST_SOURCE_DIR}/ttsafe_cancel.c
|
||||
${HDF5_TEST_SOURCE_DIR}/ttsafe_acreate.c
|
||||
)
|
||||
TARGET_NAMING (ttsafe-shared SHARED)
|
||||
TARGET_C_PROPERTIES (ttsafe-shared SHARED " " " ")
|
||||
target_link_libraries (ttsafe-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
|
||||
set_target_properties (ttsafe-shared PROPERTIES FOLDER test)
|
||||
@ -386,7 +376,6 @@ endforeach ()
|
||||
# This has to be copied to the test directory for execve() to find it
|
||||
# and it can't be renamed (i.e., no <foo>-shared).
|
||||
add_executable (accum_swmr_reader ${HDF5_TEST_SOURCE_DIR}/accum_swmr_reader.c)
|
||||
TARGET_NAMING (accum_swmr_reader STATIC)
|
||||
TARGET_C_PROPERTIES (accum_swmr_reader STATIC " " " ")
|
||||
target_link_libraries (accum_swmr_reader ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
|
||||
set_target_properties (accum_swmr_reader PROPERTIES FOLDER test)
|
||||
@ -414,13 +403,11 @@ endif ()
|
||||
##############################################################################
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (filter_plugin ${HDF5_TEST_SOURCE_DIR}/filter_plugin.c)
|
||||
TARGET_NAMING (filter_plugin SHARED)
|
||||
TARGET_C_PROPERTIES (filter_plugin SHARED " " " ")
|
||||
target_link_libraries (filter_plugin ${HDF5_TEST_LIB_TARGET})
|
||||
set_target_properties (filter_plugin PROPERTIES FOLDER test)
|
||||
else ()
|
||||
add_executable (filter_plugin ${HDF5_TEST_SOURCE_DIR}/filter_plugin.c)
|
||||
TARGET_NAMING (filter_plugin STATIC)
|
||||
TARGET_C_PROPERTIES (filter_plugin STATIC " " " ")
|
||||
target_link_libraries (filter_plugin ${HDF5_TEST_LIB_TARGET})
|
||||
set_target_properties (filter_plugin PROPERTIES FOLDER test)
|
||||
@ -431,13 +418,11 @@ endif ()
|
||||
##############################################################################
|
||||
set (use_append_chunk_SOURCES ${HDF5_TEST_SOURCE_DIR}/use_append_chunk.c ${HDF5_TEST_SOURCE_DIR}/use_common.c)
|
||||
add_executable (use_append_chunk ${use_append_chunk_SOURCES})
|
||||
TARGET_NAMING (use_append_chunk STATIC)
|
||||
TARGET_C_PROPERTIES (use_append_chunk STATIC " " " ")
|
||||
target_link_libraries (use_append_chunk ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
|
||||
set_target_properties (use_append_chunk PROPERTIES FOLDER test)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (use_append_chunk-shared ${use_append_chunk_SOURCES})
|
||||
TARGET_NAMING (use_append_chunk-shared SHARED)
|
||||
TARGET_C_PROPERTIES (use_append_chunk-shared SHARED " " " ")
|
||||
target_link_libraries (use_append_chunk-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
|
||||
set_target_properties (use_append_chunk-shared PROPERTIES FOLDER test)
|
||||
@ -445,13 +430,11 @@ endif ()
|
||||
|
||||
set (use_append_mchunks_SOURCES ${HDF5_TEST_SOURCE_DIR}/use_append_mchunks.c ${HDF5_TEST_SOURCE_DIR}/use_common.c)
|
||||
add_executable (use_append_mchunks ${use_append_mchunks_SOURCES})
|
||||
TARGET_NAMING (use_append_mchunks STATIC)
|
||||
TARGET_C_PROPERTIES (use_append_mchunks STATIC " " " ")
|
||||
target_link_libraries (use_append_mchunks ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
|
||||
set_target_properties (use_append_mchunks PROPERTIES FOLDER test)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (use_append_mchunks-shared ${use_append_mchunks_SOURCES})
|
||||
TARGET_NAMING (use_append_mchunks-shared SHARED)
|
||||
TARGET_C_PROPERTIES (use_append_mchunks-shared SHARED " " " ")
|
||||
target_link_libraries (use_append_mchunks-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
|
||||
set_target_properties (use_append_mchunks-shared PROPERTIES FOLDER test)
|
||||
@ -459,13 +442,11 @@ endif ()
|
||||
|
||||
set (use_disable_mdc_flushes_SOURCES ${HDF5_TEST_SOURCE_DIR}/use_disable_mdc_flushes.c)
|
||||
add_executable (use_disable_mdc_flushes ${use_disable_mdc_flushes_SOURCES})
|
||||
TARGET_NAMING (use_disable_mdc_flushes STATIC)
|
||||
TARGET_C_PROPERTIES (use_disable_mdc_flushes STATIC " " " ")
|
||||
target_link_libraries (use_disable_mdc_flushes ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
|
||||
set_target_properties (use_disable_mdc_flushes PROPERTIES FOLDER test)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (use_disable_mdc_flushes-shared ${use_disable_mdc_flushes_SOURCES})
|
||||
TARGET_NAMING (use_disable_mdc_flushes-shared SHARED)
|
||||
TARGET_C_PROPERTIES (use_disable_mdc_flushes-shared SHARED " " " ")
|
||||
target_link_libraries (use_disable_mdc_flushes-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
|
||||
set_target_properties (use_disable_mdc_flushes-shared PROPERTIES FOLDER test)
|
||||
|
||||
@ -1133,7 +1133,7 @@ if (HDF5_TEST_VFD)
|
||||
macro (CHECK_VFD_TEST vfdtest vfdname resultcode)
|
||||
if ("${vfdtest}" STREQUAL "flush1" OR "${vfdtest}" STREQUAL "flush2")
|
||||
if ("${vfdname}" STREQUAL "multi" OR "${vfdname}" STREQUAL "split")
|
||||
if (NOT BUILD_SHARED_LIBS AND NOT HDF5_BUILD_TYPE MATCHES Debug)
|
||||
if (NOT BUILD_SHARED_LIBS AND NOT CMAKE_BUILD_TYPE MATCHES Debug)
|
||||
add_test (NAME VFD-${vfdname}-${vfdtest}
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
-D "TEST_PROGRAM=$<TARGET_FILE:${vfdtest}>"
|
||||
@ -1345,7 +1345,6 @@ endif ()
|
||||
if (HDF5_BUILD_GENERATORS)
|
||||
macro (ADD_H5_GENERATOR genfile)
|
||||
add_executable (${genfile} ${HDF5_TEST_SOURCE_DIR}/${genfile}.c)
|
||||
TARGET_NAMING (${genfile} STATIC)
|
||||
TARGET_C_PROPERTIES (${genfile} STATIC " " " ")
|
||||
target_link_libraries (${genfile} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (${genfile} PROPERTIES FOLDER generator/test)
|
||||
|
||||
@ -28,7 +28,6 @@ set (testphdf5_SOURCES
|
||||
|
||||
#-- Adding test for testhdf5
|
||||
add_executable (testphdf5 ${testphdf5_SOURCES})
|
||||
TARGET_NAMING (testphdf5 STATIC)
|
||||
TARGET_C_PROPERTIES (testphdf5 STATIC " " " ")
|
||||
target_link_libraries (testphdf5 PUBLIC ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND)
|
||||
@ -38,7 +37,6 @@ set_target_properties (testphdf5 PROPERTIES FOLDER test/par)
|
||||
|
||||
MACRO (ADD_H5P_EXE file)
|
||||
add_executable (${file} ${HDF5_TEST_PAR_SOURCE_DIR}/${file}.c)
|
||||
TARGET_NAMING (${file} STATIC)
|
||||
TARGET_C_PROPERTIES (${file} STATIC " " " ")
|
||||
target_link_libraries (${file} PUBLIC ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND)
|
||||
|
||||
@ -10,7 +10,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
# Add the h5copy and test executables
|
||||
# --------------------------------------------------------------------
|
||||
add_executable (h5copy ${HDF5_TOOLS_SRC_H5COPY_SOURCE_DIR}/h5copy.c)
|
||||
TARGET_NAMING (h5copy STATIC)
|
||||
TARGET_C_PROPERTIES (h5copy STATIC " " " ")
|
||||
target_link_libraries (h5copy ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (h5copy PROPERTIES FOLDER tools)
|
||||
@ -20,7 +19,6 @@ set (H5_DEP_EXECUTABLES h5copy)
|
||||
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (h5copy-shared ${HDF5_TOOLS_SRC_H5COPY_SOURCE_DIR}/h5copy.c)
|
||||
TARGET_NAMING (h5copy-shared SHARED)
|
||||
TARGET_C_PROPERTIES (h5copy-shared SHARED " " " ")
|
||||
target_link_libraries (h5copy-shared ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
|
||||
set_target_properties (h5copy-shared PROPERTIES FOLDER tools)
|
||||
|
||||
@ -13,7 +13,6 @@ add_executable (h5diff
|
||||
${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
|
||||
${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c
|
||||
)
|
||||
TARGET_NAMING (h5diff STATIC)
|
||||
TARGET_C_PROPERTIES (h5diff STATIC " " " ")
|
||||
target_link_libraries (h5diff ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (h5diff PROPERTIES FOLDER tools)
|
||||
@ -26,7 +25,6 @@ if (BUILD_SHARED_LIBS)
|
||||
${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
|
||||
${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c
|
||||
)
|
||||
TARGET_NAMING (h5diff-shared SHARED)
|
||||
TARGET_C_PROPERTIES (h5diff-shared SHARED " " " ")
|
||||
target_link_libraries (h5diff-shared ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
|
||||
set_target_properties (h5diff-shared PROPERTIES FOLDER tools)
|
||||
@ -40,7 +38,6 @@ if (H5_HAVE_PARALLEL)
|
||||
${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
|
||||
${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/ph5diff_main.c
|
||||
)
|
||||
TARGET_NAMING (ph5diff STATIC)
|
||||
TARGET_C_PROPERTIES (ph5diff STATIC " " " ")
|
||||
target_link_libraries (ph5diff ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (ph5diff PROPERTIES FOLDER tools)
|
||||
|
||||
@ -14,7 +14,6 @@ add_executable (h5dump
|
||||
${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.c
|
||||
${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.c
|
||||
)
|
||||
TARGET_NAMING (h5dump STATIC)
|
||||
TARGET_C_PROPERTIES (h5dump STATIC " " " ")
|
||||
target_link_libraries (h5dump ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (h5dump PROPERTIES FOLDER tools)
|
||||
@ -28,7 +27,6 @@ if (BUILD_SHARED_LIBS)
|
||||
${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.c
|
||||
${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.c
|
||||
)
|
||||
TARGET_NAMING (h5dump-shared SHARED)
|
||||
TARGET_C_PROPERTIES (h5dump-shared SHARED " " " ")
|
||||
target_link_libraries (h5dump-shared ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
|
||||
set_target_properties (h5dump-shared PROPERTIES FOLDER tools)
|
||||
|
||||
@ -10,7 +10,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
# Add the h5format_convert executables
|
||||
# --------------------------------------------------------------------
|
||||
add_executable (h5format_convert ${HDF5_TOOLS_SRC_H5FC_SOURCE_DIR}/h5format_convert.c)
|
||||
TARGET_NAMING (h5format_convert STATIC)
|
||||
TARGET_C_PROPERTIES (h5format_convert STATIC " " " ")
|
||||
target_link_libraries (h5format_convert ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (h5format_convert PROPERTIES FOLDER tools)
|
||||
|
||||
@ -10,7 +10,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
# Add the h5import executables
|
||||
# --------------------------------------------------------------------
|
||||
add_executable (h5import ${HDF5_TOOLS_SRC_H5IMPORT_SOURCE_DIR}/h5import.c)
|
||||
TARGET_NAMING (h5import STATIC)
|
||||
TARGET_C_PROPERTIES (h5import STATIC " " " ")
|
||||
target_link_libraries (h5import ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
#set_target_properties (h5import PROPERTIES COMPILE_DEFINITIONS H5DEBUGIMPORT)
|
||||
|
||||
@ -10,14 +10,12 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
# Add the h5jam executables
|
||||
# --------------------------------------------------------------------
|
||||
add_executable (h5jam ${HDF5_TOOLS_SRC_H5JAM_SOURCE_DIR}/h5jam.c)
|
||||
TARGET_NAMING (h5jam STATIC)
|
||||
TARGET_C_PROPERTIES (h5jam STATIC " " " ")
|
||||
target_link_libraries (h5jam ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (h5jam PROPERTIES FOLDER tools)
|
||||
set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5jam")
|
||||
|
||||
add_executable (h5unjam ${HDF5_TOOLS_SRC_H5JAM_SOURCE_DIR}/h5unjam.c)
|
||||
TARGET_NAMING (h5unjam STATIC)
|
||||
TARGET_C_PROPERTIES (h5unjam STATIC " " " ")
|
||||
target_link_libraries (h5unjam ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (h5unjam PROPERTIES FOLDER tools)
|
||||
|
||||
@ -10,7 +10,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
# Add the h5ls executable
|
||||
#-----------------------------------------------------------------------------
|
||||
add_executable (h5ls ${HDF5_TOOLS_SRC_H5LS_SOURCE_DIR}/h5ls.c)
|
||||
TARGET_NAMING (h5ls STATIC)
|
||||
TARGET_C_PROPERTIES (h5ls STATIC " " " ")
|
||||
target_link_libraries (h5ls ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (h5ls PROPERTIES FOLDER tools)
|
||||
@ -20,7 +19,6 @@ set (H5_DEP_EXECUTABLES h5ls)
|
||||
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (h5ls-shared ${HDF5_TOOLS_SRC_H5LS_SOURCE_DIR}/h5ls.c)
|
||||
TARGET_NAMING (h5ls-shared SHARED)
|
||||
TARGET_C_PROPERTIES (h5ls-shared SHARED " " " ")
|
||||
target_link_libraries (h5ls-shared ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
|
||||
set_target_properties (h5ls-shared PROPERTIES FOLDER tools)
|
||||
|
||||
@ -21,7 +21,6 @@ set (REPACK_COMMON_SOURCES
|
||||
)
|
||||
|
||||
add_executable (h5repack ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_SRC_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})
|
||||
set_target_properties (h5repack PROPERTIES FOLDER tools)
|
||||
@ -31,7 +30,6 @@ set (H5_DEP_EXECUTABLES h5repack)
|
||||
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (h5repack-shared ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack_main.c)
|
||||
TARGET_NAMING (h5repack-shared SHARED)
|
||||
TARGET_C_PROPERTIES (h5repack-shared SHARED " " " ")
|
||||
target_link_libraries (h5repack-shared ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
|
||||
set_target_properties (h5repack-shared PROPERTIES FOLDER tools)
|
||||
|
||||
@ -45,9 +45,9 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
|
||||
int f, k, l, p, q, end_obj = -1, no_param = 0;
|
||||
unsigned j, n;
|
||||
char sobj[MAX_NC_NAME];
|
||||
char scomp[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
|
||||
char stype[6] = {0, 0, 0, 0, 0, 0};
|
||||
char smask[3] = {0, 0, 0};
|
||||
char scomp[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
|
||||
char stype[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
|
||||
char smask[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
|
||||
obj_list_t* obj_list = NULL;
|
||||
unsigned pixels_per_block;
|
||||
|
||||
@ -116,7 +116,6 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
|
||||
if (c == '=' || i == len - 1) {
|
||||
if (c == '=') { /*one more parameter */
|
||||
scomp[k] = '\0'; /*cut space */
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
* H5Z_FILTER_SZIP
|
||||
* szip has the format SZIP=<pixels per block,coding>
|
||||
@ -236,8 +235,9 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
|
||||
filt->cd_nelmts = HDstrtoull(stype, NULL, 0);
|
||||
p = 0;
|
||||
}
|
||||
else
|
||||
else {
|
||||
filt->cd_values[j++] = (unsigned)HDstrtoul(stype, NULL, 0);
|
||||
}
|
||||
q = 0;
|
||||
u++; /* skip ',' */
|
||||
}
|
||||
@ -462,7 +462,7 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
|
||||
return obj_list;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
* Function: parse_layout
|
||||
*
|
||||
|
||||
@ -10,7 +10,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
# Add the h5stat executables
|
||||
# --------------------------------------------------------------------
|
||||
add_executable (h5stat ${HDF5_TOOLS_SRC_H5STAT_SOURCE_DIR}/h5stat.c)
|
||||
TARGET_NAMING (h5stat STATIC)
|
||||
TARGET_C_PROPERTIES (h5stat STATIC " " " ")
|
||||
target_link_libraries (h5stat ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (h5stat PROPERTIES FOLDER tools)
|
||||
@ -20,7 +19,6 @@ set (H5_DEP_EXECUTABLES h5stat)
|
||||
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_executable (h5stat-shared ${HDF5_TOOLS_SRC_H5STAT_SOURCE_DIR}/h5stat.c)
|
||||
TARGET_NAMING (h5stat-shared SHARED)
|
||||
TARGET_C_PROPERTIES (h5stat-shared SHARED " " " ")
|
||||
target_link_libraries (h5stat-shared ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
|
||||
set_target_properties (h5stat-shared PROPERTIES FOLDER tools)
|
||||
|
||||
@ -11,28 +11,24 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
# --------------------------------------------------------------------
|
||||
#-- Misc Executables
|
||||
add_executable (h5debug ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5debug.c)
|
||||
TARGET_NAMING (h5debug STATIC)
|
||||
TARGET_C_PROPERTIES (h5debug STATIC " " " ")
|
||||
target_link_libraries (h5debug ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
|
||||
set_target_properties (h5debug PROPERTIES FOLDER tools)
|
||||
set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5debug")
|
||||
|
||||
add_executable (h5repart ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5repart.c)
|
||||
TARGET_NAMING (h5repart STATIC)
|
||||
TARGET_C_PROPERTIES (h5repart STATIC " " " ")
|
||||
target_link_libraries (h5repart ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
|
||||
set_target_properties (h5repart PROPERTIES FOLDER tools)
|
||||
set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5repart")
|
||||
|
||||
add_executable (h5mkgrp ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5mkgrp.c)
|
||||
TARGET_NAMING (h5mkgrp STATIC)
|
||||
TARGET_C_PROPERTIES (h5mkgrp STATIC " " " ")
|
||||
target_link_libraries (h5mkgrp ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (h5mkgrp PROPERTIES FOLDER tools)
|
||||
set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5mkgrp")
|
||||
|
||||
add_executable (h5clear ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5clear.c)
|
||||
TARGET_NAMING (h5clear STATIC)
|
||||
TARGET_C_PROPERTIES (h5clear STATIC " " " ")
|
||||
target_link_libraries (h5clear ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (h5clear PROPERTIES FOLDER tools)
|
||||
|
||||
@ -12,7 +12,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
|
||||
if (HDF5_BUILD_GENERATORS)
|
||||
add_executable (h5copygentest ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/h5copygentest.c)
|
||||
TARGET_NAMING (h5copygentest STATIC)
|
||||
TARGET_C_PROPERTIES (h5copygentest STATIC " " " ")
|
||||
target_link_libraries (h5copygentest ${HDF5_LIB_TARGET})
|
||||
set_target_properties (h5copygentest PROPERTIES FOLDER generator/tools)
|
||||
|
||||
@ -11,7 +11,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
# --------------------------------------------------------------------
|
||||
if (HDF5_BUILD_GENERATORS)
|
||||
add_executable (h5diffgentest ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/h5diffgentest.c)
|
||||
TARGET_NAMING (h5diffgentest STATIC)
|
||||
TARGET_C_PROPERTIES (h5diffgentest STATIC " " " ")
|
||||
target_link_libraries (h5diffgentest ${HDF5_LIB_TARGET})
|
||||
set_target_properties (h5diffgentest PROPERTIES FOLDER generator/tools)
|
||||
|
||||
@ -39,7 +39,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
# --------------------------------------------------------------------
|
||||
if (HDF5_BUILD_GENERATORS)
|
||||
add_executable (h5dumpgentest ${HDF5_TOOLS_TEST_H5DUMP_SOURCE_DIR}/h5dumpgentest.c)
|
||||
TARGET_NAMING (h5dumpgentest STATIC)
|
||||
TARGET_C_PROPERTIES (h5dumpgentest STATIC " " " ")
|
||||
target_link_libraries (h5dumpgentest ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
|
||||
set_target_properties (h5dumpgentest PROPERTIES FOLDER generator/tools)
|
||||
|
||||
@ -10,14 +10,12 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
# Add the h5format_convert test executables
|
||||
# --------------------------------------------------------------------
|
||||
add_executable (h5fc_chk_idx ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/h5fc_chk_idx.c)
|
||||
TARGET_NAMING (h5fc_chk_idx STATIC)
|
||||
TARGET_C_PROPERTIES (h5fc_chk_idx STATIC " " " ")
|
||||
target_link_libraries (h5fc_chk_idx ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
|
||||
set_target_properties (h5fc_chk_idx PROPERTIES FOLDER tools)
|
||||
|
||||
if (HDF5_BUILD_GENERATORS)
|
||||
add_executable (h5fc_gentest ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/h5fc_gentest.c)
|
||||
TARGET_NAMING (h5fc_gentest STATIC)
|
||||
TARGET_C_PROPERTIES (h5fc_gentest STATIC " " " ")
|
||||
target_link_libraries (h5fc_gentest ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
|
||||
set_target_properties (h5fc_gentest PROPERTIES FOLDER generator/tools)
|
||||
|
||||
@ -10,7 +10,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
# Add the h5import executables
|
||||
# --------------------------------------------------------------------
|
||||
add_executable (h5importtest ${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/h5importtest.c)
|
||||
TARGET_NAMING (h5importtest STATIC)
|
||||
TARGET_C_PROPERTIES (h5importtest STATIC " " " ")
|
||||
target_link_libraries (h5importtest ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
|
||||
set_target_properties (h5importtest PROPERTIES FOLDER tools)
|
||||
|
||||
@ -11,7 +11,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
# --------------------------------------------------------------------
|
||||
if (HDF5_BUILD_GENERATORS)
|
||||
add_executable (h5jamgentest ${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/h5jamgentest.c)
|
||||
TARGET_NAMING (h5jamgentest STATIC)
|
||||
TARGET_C_PROPERTIES (testhdf5 STATIC " " " ")
|
||||
target_link_libraries (h5jamgentest ${HDF5_LIB_TARGET})
|
||||
set_target_properties (h5jamgentest PROPERTIES FOLDER generator/tools)
|
||||
@ -20,13 +19,11 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
endif ()
|
||||
|
||||
add_executable (getub ${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/getub.c)
|
||||
TARGET_NAMING (getub STATIC)
|
||||
TARGET_C_PROPERTIES (getub STATIC " " " ")
|
||||
target_link_libraries (getub ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (getub PROPERTIES FOLDER tools)
|
||||
|
||||
add_executable (tellub ${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/tellub.c)
|
||||
TARGET_NAMING (tellub STATIC)
|
||||
TARGET_C_PROPERTIES (tellub STATIC " " " ")
|
||||
target_link_libraries (tellub ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
set_target_properties (tellub PROPERTIES FOLDER tools)
|
||||
|
||||
@ -12,7 +12,6 @@ INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR})
|
||||
# Add h5Repack test executables
|
||||
# --------------------------------------------------------------------
|
||||
add_executable (testh5repack_detect_szip ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testh5repack_detect_szip.c)
|
||||
TARGET_NAMING (testh5repack_detect_szip STATIC)
|
||||
TARGET_C_PROPERTIES (testh5repack_detect_szip STATIC " " " ")
|
||||
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)
|
||||
@ -27,7 +26,6 @@ set (REPACK_COMMON_SOURCES
|
||||
${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack.c
|
||||
)
|
||||
add_executable (h5repacktest ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_TEST_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})
|
||||
set_target_properties (h5repacktest PROPERTIES FOLDER tools)
|
||||
|
||||
@ -11,7 +11,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
# --------------------------------------------------------------------
|
||||
if (HDF5_BUILD_GENERATORS)
|
||||
add_executable (h5stat_gentest ${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/h5stat_gentest.c)
|
||||
TARGET_NAMING (h5stat_gentest STATIC)
|
||||
TARGET_C_PROPERTIES (h5stat_gentest STATIC " " " ")
|
||||
target_link_libraries (h5stat_gentest ${HDF5_LIB_TARGET})
|
||||
set_target_properties (h5stat_gentest PROPERTIES FOLDER generator/tools)
|
||||
|
||||
@ -11,14 +11,12 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
# --------------------------------------------------------------------
|
||||
if (HDF5_BUILD_GENERATORS)
|
||||
add_executable (h5repart_gentest ${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/h5repart_gentest.c)
|
||||
TARGET_NAMING (h5repart_gentest STATIC)
|
||||
TARGET_C_PROPERTIES (h5repart_gentest STATIC " " " ")
|
||||
target_link_libraries (h5repart_gentest ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
|
||||
set_target_properties (h5repart_gentest PROPERTIES FOLDER generator/tools)
|
||||
#add_test (NAME h5repart_gentest COMMAND $<TARGET_FILE:h5repart_gentest>)
|
||||
|
||||
add_executable (h5clear_gentest ${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/h5clear_gentest.c)
|
||||
TARGET_NAMING (h5clear_gentest STATIC)
|
||||
TARGET_C_PROPERTIES (h5clear_gentest STATIC " " " ")
|
||||
target_link_libraries (h5clear_gentest ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
|
||||
set_target_properties (h5clear_gentest PROPERTIES FOLDER tools)
|
||||
@ -29,13 +27,11 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
endif ()
|
||||
|
||||
add_executable (h5repart_test ${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/repart_test.c)
|
||||
TARGET_NAMING (h5repart_test STATIC)
|
||||
TARGET_C_PROPERTIES (h5repart_test STATIC " " " ")
|
||||
target_link_libraries (h5repart_test ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
|
||||
set_target_properties (h5repart_test PROPERTIES FOLDER tools)
|
||||
|
||||
add_executable (clear_open_chk ${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/clear_open_chk.c)
|
||||
TARGET_NAMING (clear_open_chk STATIC)
|
||||
TARGET_C_PROPERTIES (clear_open_chk STATIC " " " ")
|
||||
target_link_libraries (clear_open_chk ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
|
||||
set_target_properties (clear_open_chk PROPERTIES FOLDER tools)
|
||||
|
||||
@ -8,7 +8,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
|
||||
|
||||
MACRO (ADD_H5_GENERATOR genfile)
|
||||
add_executable (${genfile} ${HDF5_TOOLS_TEST_MISC_VDS_SOURCE_DIR}/${genfile}.c)
|
||||
TARGET_NAMING (${genfile} STATIC)
|
||||
TARGET_C_PROPERTIES (${genfile} STATIC " " " ")
|
||||
target_link_libraries (${genfile} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
|
||||
set_target_properties (${genfile} PROPERTIES FOLDER generator/tools)
|
||||
|
||||
@ -21,7 +21,6 @@ set (h5perf_serial_SOURCES
|
||||
${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/sio_engine.c
|
||||
)
|
||||
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})
|
||||
set_target_properties (h5perf_serial PROPERTIES FOLDER perform)
|
||||
@ -33,7 +32,6 @@ if (HDF5_BUILD_PERFORM_STANDALONE)
|
||||
${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/sio_engine.c
|
||||
)
|
||||
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})
|
||||
set_target_properties (h5perf_serial_alone PROPERTIES FOLDER perform)
|
||||
@ -47,7 +45,6 @@ set (chunk_SOURCES
|
||||
${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/chunk.c
|
||||
)
|
||||
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)
|
||||
@ -57,7 +54,6 @@ set (iopipe_SOURCES
|
||||
${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/iopipe.c
|
||||
)
|
||||
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)
|
||||
@ -67,7 +63,6 @@ set (overhead_SOURCES
|
||||
${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/overhead.c
|
||||
)
|
||||
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})
|
||||
set_target_properties (overhead PROPERTIES FOLDER perform)
|
||||
@ -77,7 +72,6 @@ set_target_properties (overhead PROPERTIES FOLDER perform)
|
||||
${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/perf_meta.c
|
||||
)
|
||||
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})
|
||||
set_target_properties (perf_meta PROPERTIES FOLDER perform)
|
||||
@ -87,7 +81,6 @@ set (zip_perf_SOURCES
|
||||
${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/zip_perf.c
|
||||
)
|
||||
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})
|
||||
set_target_properties (zip_perf PROPERTIES FOLDER perform)
|
||||
@ -99,7 +92,6 @@ if (H5_HAVE_PARALLEL AND BUILD_TESTING)
|
||||
${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/pio_engine.c
|
||||
)
|
||||
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})
|
||||
set_target_properties (h5perf PROPERTIES FOLDER perform)
|
||||
@ -111,7 +103,6 @@ if (H5_HAVE_PARALLEL AND BUILD_TESTING)
|
||||
${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/pio_engine.c
|
||||
)
|
||||
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})
|
||||
set_target_properties (h5perf_alone PROPERTIES FOLDER perform)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user