mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-24 15:25:00 +08:00
Merge pull request #561 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '0563edffa18320e8d09e13073930390624ab3368': Add toolset option Synchronize cmake files with develop Updated note based on guidelines Note HDFFV-8611 change
This commit is contained in:
Allen Byrne
commit
a92867f77f
@ -117,8 +117,12 @@ endif ()
|
||||
#-----------------------------------------------------------------------------
|
||||
# Initialize the CTEST commands
|
||||
#------------------------------
|
||||
set(CTEST_CONFIGURE_TOOLSET "")
|
||||
if(CMAKE_GENERATOR_TOOLSET)
|
||||
set(CTEST_CONFIGURE_TOOLSET "-T${CMAKE_GENERATOR_TOOLSET}")
|
||||
endif()
|
||||
set (CTEST_CONFIGURE_COMMAND
|
||||
"${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\""
|
||||
"${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\""
|
||||
)
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
@ -17,92 +17,79 @@ cmake_minimum_required(VERSION 3.2.2 FATAL_ERROR)
|
||||
###############################################################################################################
|
||||
|
||||
set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
|
||||
if("@CMAKE_GENERATOR_TOOLSET@")
|
||||
set(CMAKE_GENERATOR_TOOLSET "@CMAKE_GENERATOR_TOOLSET@")
|
||||
endif()
|
||||
set(CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY})
|
||||
|
||||
# handle input parameters to script.
|
||||
#INSTALLDIR - HDF5-1.8 root folder
|
||||
#CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo
|
||||
#CTEST_SOURCE_NAME - name of source folder; HDF4Examples
|
||||
#STATIC_ONLY - Default is YES
|
||||
#FORTRAN_LIBRARIES - Default is NO
|
||||
##NO_MAC_FORTRAN - set to TRUE to allow shared libs on a Mac)
|
||||
#CTEST_SOURCE_NAME - name of source folder; HDF5Examples
|
||||
if(DEFINED CTEST_SCRIPT_ARG)
|
||||
# transform ctest script arguments of the form
|
||||
# script.ctest,var1=value1,var2=value2
|
||||
# to variables with the respective names set to the respective values
|
||||
string(REPLACE "," ";" script_args "${CTEST_SCRIPT_ARG}")
|
||||
foreach(current_var ${script_args})
|
||||
if ("${current_var}" MATCHES "^([^=]+)=(.+)$")
|
||||
set("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")
|
||||
endif ()
|
||||
endforeach ()
|
||||
endif ()
|
||||
if(NOT DEFINED INSTALLDIR)
|
||||
set(INSTALLDIR "@CMAKE_INSTALL_PREFIX@")
|
||||
endif ()
|
||||
# transform ctest script arguments of the form
|
||||
# script.ctest,var1=value1,var2=value2
|
||||
# to variables with the respective names set to the respective values
|
||||
string(REPLACE "," ";" script_args "${CTEST_SCRIPT_ARG}")
|
||||
foreach(current_var ${script_args})
|
||||
if("${current_var}" MATCHES "^([^=]+)=(.+)$")
|
||||
set("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")
|
||||
endif()
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
###################################################################
|
||||
### Following Line is one of [Release, RelWithDebInfo, Debug] #####
|
||||
set(CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")
|
||||
if(NOT DEFINED CTEST_CONFIGURATION_TYPE)
|
||||
set(CTEST_CONFIGURATION_TYPE "Release")
|
||||
endif ()
|
||||
set(CTEST_CONFIGURATION_TYPE "Release")
|
||||
endif()
|
||||
set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=${CTEST_CONFIGURATION_TYPE}")
|
||||
##################################################################
|
||||
|
||||
if(NOT DEFINED INSTALLDIR)
|
||||
set(INSTALLDIR "@CMAKE_INSTALL_PREFIX@")
|
||||
endif()
|
||||
|
||||
if(NOT DEFINED CTEST_SOURCE_NAME)
|
||||
set(CTEST_SOURCE_NAME "HDF5Examples")
|
||||
endif ()
|
||||
if(NOT DEFINED STATIC_ONLY)
|
||||
set(STATICONLYLIBRARIES "YES")
|
||||
else(NOT DEFINED STATIC_ONLY)
|
||||
set(STATICONLYLIBRARIES "NO")
|
||||
endif ()
|
||||
if(NOT DEFINED FORTRAN_LIBRARIES)
|
||||
set(FORTRANLIBRARIES "NO")
|
||||
else(NOT DEFINED FORTRAN_LIBRARIES)
|
||||
set(FORTRANLIBRARIES "YES")
|
||||
endif ()
|
||||
set(CTEST_SOURCE_NAME "HDF5Examples")
|
||||
endif()
|
||||
|
||||
if(NOT DEFINED HDF_LOCAL)
|
||||
set(CDASH_LOCAL "NO")
|
||||
else(NOT HDF_LOCAL)
|
||||
set(CDASH_LOCAL "YES")
|
||||
endif ()
|
||||
set(CDASH_LOCAL "NO")
|
||||
else()
|
||||
set(CDASH_LOCAL "YES")
|
||||
endif()
|
||||
if(NOT DEFINED CTEST_SITE)
|
||||
set(CTEST_SITE "local")
|
||||
endif ()
|
||||
set(CTEST_SITE "local")
|
||||
endif()
|
||||
if(NOT DEFINED CTEST_BUILD_NAME)
|
||||
set(CTEST_BUILD_NAME "examples")
|
||||
endif ()
|
||||
set(CTEST_BUILD_NAME "examples")
|
||||
endif()
|
||||
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
|
||||
|
||||
#TAR_SOURCE - name of tarfile
|
||||
#if(NOT DEFINED TAR_SOURCE)
|
||||
# set(CTEST_USE_TAR_SOURCE "HDF5Examples-1.2.1-Source")
|
||||
#endif ()
|
||||
#endif()
|
||||
|
||||
###############################################################################################################
|
||||
# Adjust the following SET Commands as needed
|
||||
###############################################################################################################
|
||||
if(WIN32)
|
||||
if(${STATICONLYLIBRARIES})
|
||||
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF")
|
||||
endif ()
|
||||
set(SITE_OS_NAME "Windows")
|
||||
set(ENV{HDF5_DIR} "${INSTALLDIR}/cmake")
|
||||
set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build)
|
||||
set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
|
||||
set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
|
||||
else(WIN32)
|
||||
if(${STATICONLYLIBRARIES})
|
||||
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
|
||||
endif ()
|
||||
else()
|
||||
set(ENV{HDF5_DIR} "${INSTALLDIR}/share/cmake")
|
||||
set(ENV{LD_LIBRARY_PATH} "${INSTALLDIR}/lib")
|
||||
set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
|
||||
set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
|
||||
set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
|
||||
endif(WIN32)
|
||||
if(${FORTRANLIBRARIES})
|
||||
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON")
|
||||
else ()
|
||||
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=OFF")
|
||||
endif ()
|
||||
endif()
|
||||
if(${CDASH_LOCAL})
|
||||
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
|
||||
endif ()
|
||||
endif()
|
||||
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@")
|
||||
|
||||
###############################################################################################################
|
||||
@ -110,102 +97,10 @@ set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HD
|
||||
#
|
||||
###############################################################################################################
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# MAC machines need special option
|
||||
#-----------------------------------------------------------------------------
|
||||
if(APPLE)
|
||||
# Compiler choice
|
||||
execute_process(COMMAND xcrun --find cc OUTPUT_VARIABLE XCODE_CC OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
execute_process(COMMAND xcrun --find c++ OUTPUT_VARIABLE XCODE_CXX OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
set(ENV{CC} "${XCODE_CC}")
|
||||
set(ENV{CXX} "${XCODE_CXX}")
|
||||
if(NOT NO_MAC_FORTRAN)
|
||||
# Shared fortran is not supported, build static
|
||||
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
|
||||
else ()
|
||||
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=OFF")
|
||||
endif ()
|
||||
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")
|
||||
endif ()
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
set(CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
|
||||
## --------------------------
|
||||
if(CTEST_USE_TAR_SOURCE)
|
||||
## Uncompress source if tar or zip file provided
|
||||
## --------------------------
|
||||
if(WIN32)
|
||||
message(STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_USE_TAR_SOURCE}.zip]")
|
||||
execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)
|
||||
else ()
|
||||
message(STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_USE_TAR_SOURCE}.tar]")
|
||||
execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE}.tar RESULT_VARIABLE rv)
|
||||
endif ()
|
||||
|
||||
if(NOT rv EQUAL 0)
|
||||
message(STATUS "extracting... [error-(${rv}) clean up]")
|
||||
file(REMOVE_RECURSE "${CTEST_SOURCE_DIRECTORY}")
|
||||
message(FATAL_ERROR "error: extract of ${CTEST_SOURCE_NAME} failed")
|
||||
endif ()
|
||||
endif(CTEST_USE_TAR_SOURCE)
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
## Clear the build directory
|
||||
## --------------------------
|
||||
set(CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
|
||||
if (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
|
||||
ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
|
||||
else ()
|
||||
file(MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
|
||||
endif ()
|
||||
|
||||
# Use multiple CPU cores to build
|
||||
include(ProcessorCount)
|
||||
ProcessorCount(N)
|
||||
if(NOT N EQUAL 0)
|
||||
if(NOT WIN32)
|
||||
set(CTEST_BUILD_FLAGS -j${N})
|
||||
endif ()
|
||||
set(ctest_test_args ${ctest_test_args} PARALLEL_LEVEL ${N})
|
||||
endif ()
|
||||
set (CTEST_CONFIGURE_COMMAND
|
||||
"${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\""
|
||||
)
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
## -- set output to english
|
||||
set($ENV{LC_MESSAGES} "en_EN")
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
configure_file(${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake)
|
||||
ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}")
|
||||
## NORMAL process
|
||||
## --------------------------
|
||||
ctest_start (Experimental)
|
||||
ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
||||
if(${res} LESS 0 OR ${res} GREATER 0)
|
||||
file(APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Configure: ${res}\n")
|
||||
endif ()
|
||||
if(LOCAL_SUBMIT)
|
||||
ctest_submit (PARTS Configure Notes)
|
||||
endif ()
|
||||
ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND APPEND RETURN_VALUE res NUMBER_ERRORS errval)
|
||||
if(${res} LESS 0 OR ${res} GREATER 0 OR ${errval} GREATER 0)
|
||||
file(APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed ${errval} Build: ${res}\n")
|
||||
endif ()
|
||||
if(LOCAL_SUBMIT)
|
||||
ctest_submit (PARTS Build)
|
||||
endif ()
|
||||
ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
|
||||
if(${res} LESS 0 OR ${res} GREATER 0)
|
||||
file(APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Tests: ${res}\n")
|
||||
endif ()
|
||||
if(LOCAL_SUBMIT)
|
||||
ctest_submit (PARTS Test)
|
||||
endif ()
|
||||
if(${res} LESS 0 OR ${res} GREATER 0)
|
||||
message (FATAL_ERROR "tests FAILED")
|
||||
endif ()
|
||||
#-----------------------------------------------------------------------------
|
||||
##############################################################################################################
|
||||
message(STATUS "DONE")
|
||||
if(WIN32)
|
||||
include(${CTEST_SCRIPT_DIRECTORY}\\HDF5_Examples_options.cmake)
|
||||
include(${CTEST_SCRIPT_DIRECTORY}\\CTestScript.cmake)
|
||||
else()
|
||||
include(${CTEST_SCRIPT_DIRECTORY}/HDF5_Examples_options.cmake)
|
||||
include(${CTEST_SCRIPT_DIRECTORY}/CTestScript.cmake)
|
||||
endif()
|
||||
|
||||
@ -13,91 +13,94 @@ cmake_minimum_required(VERSION 3.2.2 FATAL_ERROR)
|
||||
###############################################################################################################
|
||||
# This script will build and run the examples from a folder
|
||||
# Execute from a command line:
|
||||
# ctest -S HDF5_Examples.cmake,OPTION=VALUE -C Release -V -O test.log
|
||||
# ctest -S HDF5_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
|
||||
###############################################################################################################
|
||||
|
||||
set (CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
|
||||
set (CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY})
|
||||
set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
|
||||
if("@CMAKE_GENERATOR_TOOLSET@")
|
||||
set(CMAKE_GENERATOR_TOOLSET "@CMAKE_GENERATOR_TOOLSET@")
|
||||
endif()
|
||||
set(CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY})
|
||||
|
||||
# handle input parameters to script.
|
||||
#INSTALLDIR - HDF5 root folder
|
||||
#CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo
|
||||
#CTEST_SOURCE_NAME - name of source folder; HDF5Examples
|
||||
if (DEFINED CTEST_SCRIPT_ARG)
|
||||
if(DEFINED CTEST_SCRIPT_ARG)
|
||||
# transform ctest script arguments of the form
|
||||
# script.ctest,var1=value1,var2=value2
|
||||
# to variables with the respective names set to the respective values
|
||||
string (REPLACE "," ";" script_args "${CTEST_SCRIPT_ARG}")
|
||||
foreach (current_var ${script_args})
|
||||
if ("${current_var}" MATCHES "^([^=]+)=(.+)$")
|
||||
set ("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")
|
||||
endif ()
|
||||
endforeach ()
|
||||
endif ()
|
||||
string(REPLACE "," ";" script_args "${CTEST_SCRIPT_ARG}")
|
||||
foreach(current_var ${script_args})
|
||||
if("${current_var}" MATCHES "^([^=]+)=(.+)$")
|
||||
set("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")
|
||||
endif()
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
###################################################################
|
||||
### Following Line is one of [Release, RelWithDebInfo, Debug] #####
|
||||
set (CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")
|
||||
if (NOT DEFINED CTEST_CONFIGURATION_TYPE)
|
||||
set (CTEST_CONFIGURATION_TYPE "Release")
|
||||
endif ()
|
||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=${CTEST_CONFIGURATION_TYPE}")
|
||||
set(CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")
|
||||
if(NOT DEFINED CTEST_CONFIGURATION_TYPE)
|
||||
set(CTEST_CONFIGURATION_TYPE "Release")
|
||||
endif()
|
||||
set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=${CTEST_CONFIGURATION_TYPE}")
|
||||
##################################################################
|
||||
|
||||
if (NOT DEFINED INSTALLDIR)
|
||||
set (INSTALLDIR "@CMAKE_INSTALL_PREFIX@")
|
||||
endif ()
|
||||
if(NOT DEFINED INSTALLDIR)
|
||||
set(INSTALLDIR "@CMAKE_INSTALL_PREFIX@")
|
||||
endif()
|
||||
|
||||
if (NOT DEFINED CTEST_SOURCE_NAME)
|
||||
set (CTEST_SOURCE_NAME "HDF5Examples")
|
||||
endif ()
|
||||
if(NOT DEFINED CTEST_SOURCE_NAME)
|
||||
set(CTEST_SOURCE_NAME "HDF5Examples")
|
||||
endif()
|
||||
|
||||
if (NOT DEFINED HDF_LOCAL)
|
||||
set (CDASH_LOCAL "NO")
|
||||
else ()
|
||||
set (CDASH_LOCAL "YES")
|
||||
endif ()
|
||||
if(NOT DEFINED HDF_LOCAL)
|
||||
set(CDASH_LOCAL "NO")
|
||||
else()
|
||||
set(CDASH_LOCAL "YES")
|
||||
endif()
|
||||
if(NOT DEFINED CTEST_SITE)
|
||||
set (CTEST_SITE "local")
|
||||
endif ()
|
||||
if (NOT DEFINED CTEST_BUILD_NAME)
|
||||
set (CTEST_BUILD_NAME "examples")
|
||||
endif ()
|
||||
set (BUILD_OPTIONS "${BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
|
||||
set(CTEST_SITE "local")
|
||||
endif()
|
||||
if(NOT DEFINED CTEST_BUILD_NAME)
|
||||
set(CTEST_BUILD_NAME "examples")
|
||||
endif()
|
||||
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
|
||||
|
||||
#TAR_SOURCE - name of tarfile
|
||||
#if (NOT DEFINED TAR_SOURCE)
|
||||
# set (CTEST_USE_TAR_SOURCE "HDF5Examples-1.10.5-Source")
|
||||
#endif ()
|
||||
#if(NOT DEFINED TAR_SOURCE)
|
||||
# set(CTEST_USE_TAR_SOURCE "HDF5Examples-1.10.5-Source")
|
||||
#endif()
|
||||
|
||||
###############################################################################################################
|
||||
if (WIN32)
|
||||
set (SITE_OS_NAME "Windows")
|
||||
set (ENV{HDF5_DIR} "${INSTALLDIR}/cmake")
|
||||
set (CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build)
|
||||
set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
|
||||
set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
|
||||
else ()
|
||||
set (ENV{HDF5_DIR} "${INSTALLDIR}/share/cmake")
|
||||
set (ENV{LD_LIBRARY_PATH} "${INSTALLDIR}/lib")
|
||||
set (CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
|
||||
set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
|
||||
set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
|
||||
endif ()
|
||||
if (${CDASH_LOCAL})
|
||||
set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
|
||||
endif ()
|
||||
set (BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@")
|
||||
if(WIN32)
|
||||
set(SITE_OS_NAME "Windows")
|
||||
set(ENV{HDF5_DIR} "${INSTALLDIR}/cmake")
|
||||
set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build)
|
||||
set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
|
||||
set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
|
||||
else()
|
||||
set(ENV{HDF5_DIR} "${INSTALLDIR}/share/cmake")
|
||||
set(ENV{LD_LIBRARY_PATH} "${INSTALLDIR}/lib")
|
||||
set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
|
||||
set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
|
||||
set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
|
||||
endif()
|
||||
if(${CDASH_LOCAL})
|
||||
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
|
||||
endif()
|
||||
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@")
|
||||
|
||||
###############################################################################################################
|
||||
# For any comments please contact cdashhelp@hdfgroup.org
|
||||
#
|
||||
###############################################################################################################
|
||||
|
||||
if (WIN32)
|
||||
include (${CTEST_SCRIPT_DIRECTORY}\\HDF5_Examples_options.cmake)
|
||||
include (${CTEST_SCRIPT_DIRECTORY}\\CTestScript.cmake)
|
||||
else ()
|
||||
include (${CTEST_SCRIPT_DIRECTORY}/HDF5_Examples_options.cmake)
|
||||
include (${CTEST_SCRIPT_DIRECTORY}/CTestScript.cmake)
|
||||
endif ()
|
||||
if(WIN32)
|
||||
include(${CTEST_SCRIPT_DIRECTORY}\\HDF5_Examples_options.cmake)
|
||||
include(${CTEST_SCRIPT_DIRECTORY}\\CTestScript.cmake)
|
||||
else()
|
||||
include(${CTEST_SCRIPT_DIRECTORY}/HDF5_Examples_options.cmake)
|
||||
include(${CTEST_SCRIPT_DIRECTORY}/CTestScript.cmake)
|
||||
endif()
|
||||
|
||||
@ -44,6 +44,7 @@ set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)
|
||||
set (${HDF5_PACKAGE_NAME}_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
|
||||
set (${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS @HDF5_PACKAGE_EXTLIBS@)
|
||||
set (${HDF5_PACKAGE_NAME}_EXPORT_LIBRARIES @HDF5_LIBRARIES_TO_EXPORT@)
|
||||
set (${HDF5_PACKAGE_NAME}_TOOLSET "@CMAKE_GENERATOR_TOOLSET@")
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Dependencies
|
||||
|
||||
@ -247,21 +247,30 @@ macro (HDF_README_PROPERTIES target_fortran)
|
||||
elseif (${CMAKE_SYSTEM_VERSION} MATCHES "6.3")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM} 10")
|
||||
endif ()
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM} ${MSVC_C_ARCHITECTURE_ID}")
|
||||
if (${CMAKE_C_COMPILER_VERSION} MATCHES "^16.*")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2010")
|
||||
elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^15.*")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2008")
|
||||
elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^17.*")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2012")
|
||||
elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^18.*")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2013")
|
||||
elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.*")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2015")
|
||||
elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^20.*")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2017")
|
||||
else ()
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ${CMAKE_C_COMPILER_VERSION}")
|
||||
if (CMAKE_C_COMPILER_ID MATCHES "Intel")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM} Intel")
|
||||
if (${CMAKE_C_COMPILER_VERSION} MATCHES "^17.*")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using Intel 17")
|
||||
else ()
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using Intel ${CMAKE_C_COMPILER_VERSION}")
|
||||
endif ()
|
||||
elseif (CMAKE_C_COMPILER_ID MATCHES "MSVC")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM} ${MSVC_C_ARCHITECTURE_ID}")
|
||||
if (${CMAKE_C_COMPILER_VERSION} MATCHES "^16.*")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2010")
|
||||
elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^15.*")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2008")
|
||||
elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^17.*")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2012")
|
||||
elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^18.*")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2013")
|
||||
elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.*")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2015")
|
||||
elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^20.*")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2017")
|
||||
else ()
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ${CMAKE_C_COMPILER_VERSION}")
|
||||
endif ()
|
||||
endif ()
|
||||
elseif (APPLE)
|
||||
set (BINARY_EXAMPLE_ENDING "tar.gz")
|
||||
|
||||
@ -70,19 +70,19 @@ New Features
|
||||
|
||||
C++ Library:
|
||||
------------
|
||||
-
|
||||
-
|
||||
|
||||
Tools:
|
||||
------
|
||||
-
|
||||
-
|
||||
|
||||
High-Level APIs:
|
||||
---------------
|
||||
-
|
||||
-
|
||||
|
||||
C Packet Table API
|
||||
------------------
|
||||
-
|
||||
-
|
||||
|
||||
Internal header file
|
||||
--------------------
|
||||
@ -105,7 +105,7 @@ Bug Fixes since HDF5-1.10.0-patch1 release
|
||||
|
||||
Configuration
|
||||
-------------
|
||||
-
|
||||
-
|
||||
|
||||
Performance
|
||||
-------------
|
||||
@ -117,9 +117,29 @@ Bug Fixes since HDF5-1.10.0-patch1 release
|
||||
|
||||
Tools
|
||||
-----
|
||||
- Improved h5diff compare of strings and arrays.
|
||||
- h5repack
|
||||
|
||||
(ADB, 2017/05/18, HDFFV-9055, HDFFV-10128)
|
||||
h5repack did not maintain the creation order flag of the root
|
||||
group.
|
||||
|
||||
Improved h5repack by reading the creation order and applying the
|
||||
flag to the new root group. Also added arguments to set the
|
||||
order and index direction, which applys to the traversing of the
|
||||
original file, on the command line.
|
||||
|
||||
(ADB - 2017/05/26, HDFFV-8611)
|
||||
|
||||
- h5diff
|
||||
|
||||
h5diff failed to account for strpad type and null terminators
|
||||
of char strings. Also, h5diff failed to account for string length
|
||||
differences and would give a different result depending on file
|
||||
order in the command line.
|
||||
|
||||
Improved h5diff compare of strings and arrays by adding a check for
|
||||
string lengths and if the strpad was null filled.
|
||||
|
||||
(ADB - 2017/05/18, HDFFV-9055, HDFFV-10128)
|
||||
|
||||
High-Level APIs:
|
||||
------
|
||||
@ -144,7 +164,7 @@ Bug Fixes since HDF5-1.10.0-patch1 release
|
||||
|
||||
C++ APIs
|
||||
--------
|
||||
-
|
||||
-
|
||||
|
||||
Testing
|
||||
-------
|
||||
@ -293,16 +313,16 @@ The following platforms are not supported but have been tested for this release.
|
||||
(cmake and autotools)
|
||||
|
||||
Fedora 24 4.7.2-201.fc24.x86_64 #1 SMP x86_64 x86_64 x86_64 GNU/Linux
|
||||
gcc, g++ (GCC) 6.1.1 20160621
|
||||
gcc, g++ (GCC) 6.1.1 20160621
|
||||
(Red Hat 6.1.1-3)
|
||||
GNU Fortran (GCC) 6.1.1 20160621
|
||||
GNU Fortran (GCC) 6.1.1 20160621
|
||||
(Red Hat 6.1.1-3)
|
||||
(cmake and autotools)
|
||||
|
||||
Ubuntu 16.04.1 4.4.0-38-generic #57-Ubuntu SMP x86_64 GNU/Linux
|
||||
gcc, g++ (Ubuntu 5.4.0-6ubuntu1~16.04.2)
|
||||
gcc, g++ (Ubuntu 5.4.0-6ubuntu1~16.04.2)
|
||||
5.4.0 20160609
|
||||
GNU Fortran (Ubuntu 5.4.0-6ubuntu1~16.04.2)
|
||||
GNU Fortran (Ubuntu 5.4.0-6ubuntu1~16.04.2)
|
||||
5.4.0 20160609
|
||||
(cmake and autotools)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user