mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-13 16:47:58 +08:00
Merge pull request #351 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'e809b609d3f5cc851e13f63bcfed7052958d302b': Add reference to CMake application framwork Whitespace changes Update notes
This commit is contained in:
Allen Byrne
commit
02642c99e3
@ -663,7 +663,7 @@ adding an option (${CTEST_SCRIPT_ARG}) to the platform configuration script.
|
||||
### ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201264 -C Release -VV -O hdf5.log ###
|
||||
#############################################################################################
|
||||
|
||||
cmake_minimum_required(VERSION 3.2.2 FATAL_ERROR)
|
||||
cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
|
||||
############################################################################
|
||||
# Usage:
|
||||
# ctest -S HDF5config.cmake,OPTION=VALUE -C Release -VV -O test.log
|
||||
@ -686,152 +686,152 @@ cmake_minimum_required(VERSION 3.2.2 FATAL_ERROR)
|
||||
# NO_MAC_FORTRAN - Yes to be SHARED on a Mac
|
||||
##############################################################################
|
||||
|
||||
set(CTEST_SOURCE_VERSION 1.10.1)
|
||||
set(CTEST_SOURCE_VERSEXT "")
|
||||
set (CTEST_SOURCE_VERSION 1.10.1)
|
||||
set (CTEST_SOURCE_VERSEXT "")
|
||||
|
||||
##############################################################################
|
||||
# handle input parameters to script.
|
||||
#BUILD_GENERATOR - which CMake generator to use, required
|
||||
#INSTALLDIR - HDF5-1.10.0 root folder
|
||||
#CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo
|
||||
#CTEST_SOURCE_NAME - name of source folder; HDF5-1.10.1
|
||||
#CTEST_SOURCE_NAME - name of source folder; HDF5-1.10.0
|
||||
#STATIC_ONLY - Default is YES
|
||||
#FORTRAN_LIBRARIES - Default is NO
|
||||
#JAVA_LIBRARIES - Default is NO
|
||||
#NO_MAC_FORTRAN - set to TRUE to allow shared libs on a Mac
|
||||
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})
|
||||
string (REPLACE "," ";" script_args "${CTEST_SCRIPT_ARG}")
|
||||
foreach (current_var ${script_args})
|
||||
if ("${current_var}" MATCHES "^([^=]+)=(.+)$")
|
||||
set("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")
|
||||
set ("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")
|
||||
endif ()
|
||||
endforeach ()
|
||||
endif ()
|
||||
|
||||
# build generator must be defined
|
||||
if(NOT DEFINED BUILD_GENERATOR)
|
||||
message(FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2015, VS201564, VS2013, VS201364, VS2012, or VS201264")
|
||||
if (NOT DEFINED BUILD_GENERATOR)
|
||||
message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2015, VS201564, VS2013, VS201364, VS2012, or VS201264")
|
||||
else ()
|
||||
if(${BUILD_GENERATOR} STREQUAL "Unix")
|
||||
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
|
||||
elseif(${BUILD_GENERATOR} STREQUAL "VS2015")
|
||||
set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015")
|
||||
elseif(${BUILD_GENERATOR} STREQUAL "VS201564")
|
||||
set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
|
||||
elseif(${BUILD_GENERATOR} STREQUAL "VS2013")
|
||||
set(CTEST_CMAKE_GENERATOR "Visual Studio 12 2013")
|
||||
elseif(${BUILD_GENERATOR} STREQUAL "VS201364")
|
||||
set(CTEST_CMAKE_GENERATOR "Visual Studio 12 2013 Win64")
|
||||
elseif(${BUILD_GENERATOR} STREQUAL "VS2012")
|
||||
set(CTEST_CMAKE_GENERATOR "Visual Studio 11 2012")
|
||||
elseif(${BUILD_GENERATOR} STREQUAL "VS201264")
|
||||
set(CTEST_CMAKE_GENERATOR "Visual Studio 11 2012 Win64")
|
||||
if (${BUILD_GENERATOR} STREQUAL "Unix")
|
||||
set (CTEST_CMAKE_GENERATOR "Unix Makefiles")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS2015")
|
||||
set (CTEST_CMAKE_GENERATOR "Visual Studio 14 2015")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS201564")
|
||||
set (CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS2013")
|
||||
set (CTEST_CMAKE_GENERATOR "Visual Studio 12 2013")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS201364")
|
||||
set (CTEST_CMAKE_GENERATOR "Visual Studio 12 2013 Win64")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS2012")
|
||||
set (CTEST_CMAKE_GENERATOR "Visual Studio 11 2012")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS201264")
|
||||
set (CTEST_CMAKE_GENERATOR "Visual Studio 11 2012 Win64")
|
||||
else ()
|
||||
message(FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2015, VS201564, VS2013, VS201364, VS2012, or VS201264")
|
||||
message (FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2015, VS201564, VS2013, VS201364, VS2012, or VS201264")
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
###################################################################
|
||||
### Following Line is one of [Release, RelWithDebInfo, Debug] #####
|
||||
set(CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")
|
||||
set (CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")
|
||||
###################################################################
|
||||
|
||||
if(NOT DEFINED INSTALLDIR)
|
||||
if(WIN32)
|
||||
set(INSTALLDIR "C:/Program Files/HDF_Group/HDF5/${CTEST_SOURCE_VERSION}")
|
||||
if (NOT DEFINED INSTALLDIR)
|
||||
if (WIN32)
|
||||
set (INSTALLDIR "C:/Program Files/HDF_Group/HDF5/${CTEST_SOURCE_VERSION}")
|
||||
else ()
|
||||
set(INSTALLDIR "${CTEST_SCRIPT_DIRECTORY}/HDF_Group/HDF5/${CTEST_SOURCE_VERSION}")
|
||||
set (INSTALLDIR "${CTEST_SCRIPT_DIRECTORY}/HDF_Group/HDF5/${CTEST_SOURCE_VERSION}")
|
||||
endif ()
|
||||
endif ()
|
||||
if(NOT DEFINED CTEST_CONFIGURATION_TYPE)
|
||||
set(CTEST_CONFIGURATION_TYPE "Release")
|
||||
if (NOT DEFINED CTEST_CONFIGURATION_TYPE)
|
||||
set (CTEST_CONFIGURATION_TYPE "Release")
|
||||
endif ()
|
||||
if(NOT DEFINED CTEST_SOURCE_NAME)
|
||||
set(CTEST_SOURCE_NAME "hdf5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")
|
||||
if (NOT DEFINED CTEST_SOURCE_NAME)
|
||||
set (CTEST_SOURCE_NAME "hdf5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")
|
||||
endif ()
|
||||
if(NOT DEFINED STATIC_ONLY)
|
||||
set(STATICONLYLIBRARIES "YES")
|
||||
if (NOT DEFINED STATIC_ONLY)
|
||||
set (STATICONLYLIBRARIES "YES")
|
||||
else ()
|
||||
set(STATICONLYLIBRARIES "NO")
|
||||
set (STATICONLYLIBRARIES "NO")
|
||||
endif ()
|
||||
if(NOT DEFINED FORTRAN_LIBRARIES)
|
||||
set(FORTRANLIBRARIES "NO")
|
||||
if (NOT DEFINED FORTRAN_LIBRARIES)
|
||||
set (FORTRANLIBRARIES "NO")
|
||||
else ()
|
||||
set(FORTRANLIBRARIES "YES")
|
||||
set(FORTRANLIBRARIES "YES")
|
||||
endif ()
|
||||
if(NOT DEFINED JAVA_LIBRARIES)
|
||||
set(JAVALIBRARIES "NO")
|
||||
if (NOT DEFINED JAVA_LIBRARIES)
|
||||
set (JAVALIBRARIES "NO")
|
||||
else ()
|
||||
set(JAVALIBRARIES "YES")
|
||||
set (JAVALIBRARIES "YES")
|
||||
endif ()
|
||||
|
||||
set(CTEST_BINARY_NAME "build")
|
||||
set(CTEST_DASHBOARD_ROOT "${CTEST_SCRIPT_DIRECTORY}")
|
||||
if(WIN32)
|
||||
set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
|
||||
set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
|
||||
set (CTEST_BINARY_NAME "build")
|
||||
set (CTEST_DASHBOARD_ROOT "${CTEST_SCRIPT_DIRECTORY}")
|
||||
if (WIN32)
|
||||
set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
|
||||
set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
|
||||
else ()
|
||||
set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
|
||||
set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
|
||||
set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
|
||||
set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
|
||||
endif ()
|
||||
|
||||
###################################################################
|
||||
######### Following describes compiler ############
|
||||
if(WIN32)
|
||||
set(SITE_OS_NAME "Windows")
|
||||
set(SITE_OS_VERSION "WIN7")
|
||||
if(${BUILD_GENERATOR} STREQUAL "VS201564")
|
||||
set(SITE_OS_BITS "64")
|
||||
set(SITE_COMPILER_NAME "vs2015")
|
||||
set(SITE_COMPILER_VERSION "14")
|
||||
elseif(${BUILD_GENERATOR} STREQUAL "VS2015")
|
||||
set(SITE_OS_BITS "32")
|
||||
set(SITE_COMPILER_NAME "vs2015")
|
||||
set(SITE_COMPILER_VERSION "14")
|
||||
elseif(${BUILD_GENERATOR} STREQUAL "VS201364")
|
||||
set(SITE_OS_BITS "64")
|
||||
set(SITE_COMPILER_NAME "vs2013")
|
||||
set(SITE_COMPILER_VERSION "12")
|
||||
elseif(${BUILD_GENERATOR} STREQUAL "VS2013")
|
||||
set(SITE_OS_BITS "32")
|
||||
set(SITE_COMPILER_NAME "vs2013")
|
||||
set(SITE_COMPILER_VERSION "12")
|
||||
elseif(${BUILD_GENERATOR} STREQUAL "VS201264")
|
||||
set(SITE_OS_BITS "64")
|
||||
set(SITE_COMPILER_NAME "vs2012")
|
||||
set(SITE_COMPILER_VERSION "11")
|
||||
elseif(${BUILD_GENERATOR} STREQUAL "VS2012")
|
||||
set(SITE_OS_BITS "32")
|
||||
set(SITE_COMPILER_NAME "vs2012")
|
||||
set(SITE_COMPILER_VERSION "11")
|
||||
if (WIN32)
|
||||
set (SITE_OS_NAME "Windows")
|
||||
set (SITE_OS_VERSION "WIN7")
|
||||
if (${BUILD_GENERATOR} STREQUAL "VS201564")
|
||||
set (SITE_OS_BITS "64")
|
||||
set (SITE_COMPILER_NAME "vs2015")
|
||||
set (SITE_COMPILER_VERSION "14")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS2015")
|
||||
set (SITE_OS_BITS "32")
|
||||
set (SITE_COMPILER_NAME "vs2015")
|
||||
set (SITE_COMPILER_VERSION "14")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS201364")
|
||||
set (SITE_OS_BITS "64")
|
||||
set (SITE_COMPILER_NAME "vs2013")
|
||||
set (SITE_COMPILER_VERSION "12")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS2013")
|
||||
set (SITE_OS_BITS "32")
|
||||
set (SITE_COMPILER_NAME "vs2013")
|
||||
set (SITE_COMPILER_VERSION "12")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS201264")
|
||||
set (SITE_OS_BITS "64")
|
||||
set (SITE_COMPILER_NAME "vs2012")
|
||||
set (SITE_COMPILER_VERSION "11")
|
||||
elseif (${BUILD_GENERATOR} STREQUAL "VS2012")
|
||||
set (SITE_OS_BITS "32")
|
||||
set (SITE_COMPILER_NAME "vs2012")
|
||||
set (SITE_COMPILER_VERSION "11")
|
||||
endif ()
|
||||
## Set the following to unique id your computer ##
|
||||
set(CTEST_SITE "WIN7${BUILD_GENERATOR}.XXXX")
|
||||
set (CTEST_SITE "WIN7${BUILD_GENERATOR}.XXXX")
|
||||
else ()
|
||||
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
|
||||
set (CTEST_CMAKE_GENERATOR "Unix Makefiles")
|
||||
## Set the following to unique id your computer ##
|
||||
if(APPLE)
|
||||
set(CTEST_SITE "MAC.XXXX")
|
||||
if (APPLE)
|
||||
set (CTEST_SITE "MAC.XXXX")
|
||||
else ()
|
||||
set(CTEST_SITE "LINUX.XXXX")
|
||||
set (CTEST_SITE "LINUX.XXXX")
|
||||
endif ()
|
||||
if(APPLE)
|
||||
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}")
|
||||
set(CTEST_USE_LAUNCHERS 1)
|
||||
set(RR_WARNINGS_COMMON "-Wno-format-nonliteral -Wno-cast-align -Wno-unused -Wno-unused-variable -Wno-unused-function -Wno-self-assign -Wno-unused-parameter -Wno-sign-compare")
|
||||
set(RR_WARNINGS_C "${RR_WARNINGS_COMMON} -Wno-deprecated-declarations -Wno-uninitialized")
|
||||
set(RR_WARNINGS_CXX "${RR_WARNINGS_COMMON} -Woverloaded-virtual -Wshadow -Wwrite-strings -Wc++11-compat")
|
||||
set(RR_FLAGS_COMMON "-g -O0 -fstack-protector-all -D_FORTIFY_SOURCE=2")
|
||||
set(RR_FLAGS_C "${RR_FLAGS_COMMON}")
|
||||
set(RR_FLAGS_CXX "${RR_FLAGS_COMMON}")
|
||||
set(ENV{CFLAGS} "${RR_WARNINGS_C} ${RR_FLAGS_C}")
|
||||
set(ENV{CXXFLAGS} "${RR_WARNINGS_CXX} ${RR_FLAGS_CXX}")
|
||||
if (APPLE)
|
||||
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}")
|
||||
set (CTEST_USE_LAUNCHERS 1)
|
||||
set (RR_WARNINGS_COMMON "-Wno-format-nonliteral -Wno-cast-align -Wno-unused -Wno-unused-variable -Wno-unused-function -Wno-self-assign -Wno-unused-parameter -Wno-sign-compare")
|
||||
set (RR_WARNINGS_C "${RR_WARNINGS_COMMON} -Wno-deprecated-declarations -Wno-uninitialized")
|
||||
set (RR_WARNINGS_CXX "${RR_WARNINGS_COMMON} -Woverloaded-virtual -Wshadow -Wwrite-strings -Wc++11-compat")
|
||||
set (RR_FLAGS_COMMON "-g -O0 -fstack-protector-all -D_FORTIFY_SOURCE=2")
|
||||
set (RR_FLAGS_C "${RR_FLAGS_COMMON}")
|
||||
set (RR_FLAGS_CXX "${RR_FLAGS_COMMON}")
|
||||
set (ENV{CFLAGS} "${RR_WARNINGS_C} ${RR_FLAGS_C}")
|
||||
set (ENV{CXXFLAGS} "${RR_WARNINGS_CXX} ${RR_FLAGS_CXX}")
|
||||
endif ()
|
||||
endif ()
|
||||
###################################################################
|
||||
@ -839,99 +839,99 @@ endif ()
|
||||
###################################################################
|
||||
######### Following is for submission to CDash ############
|
||||
###################################################################
|
||||
set(MODEL "Experimental")
|
||||
set (MODEL "Experimental")
|
||||
###################################################################
|
||||
|
||||
###################################################################
|
||||
##### Following controls CDash submission #####
|
||||
#set(LOCAL_SUBMIT "TRUE")
|
||||
#set (LOCAL_SUBMIT "TRUE")
|
||||
##### Following controls test process #####
|
||||
#set(LOCAL_SKIP_TEST "TRUE")
|
||||
#set(LOCAL_MEMCHECK_TEST "TRUE")
|
||||
#set(LOCAL_COVERAGE_TEST "TRUE")
|
||||
#set (LOCAL_SKIP_TEST "TRUE")
|
||||
#set (LOCAL_MEMCHECK_TEST "TRUE")
|
||||
#set (LOCAL_COVERAGE_TEST "TRUE")
|
||||
##### Following controls cpack command #####
|
||||
#set(LOCAL_NO_PACKAGE "TRUE")
|
||||
#set (LOCAL_NO_PACKAGE "TRUE")
|
||||
##### Following controls source update #####
|
||||
#set(LOCAL_UPDATE "TRUE")
|
||||
set(REPOSITORY_URL "https://git@bitbucket.hdfgroup.org/scm/hdffv/hdf5.git")
|
||||
set(REPOSITORY_BRANCH "develop")
|
||||
#set (LOCAL_UPDATE "TRUE")
|
||||
set (REPOSITORY_URL "https://git@bitbucket.hdfgroup.org/scm/hdffv/hdf5.git")
|
||||
set (REPOSITORY_BRANCH "develop")
|
||||
|
||||
#uncomment to use a compressed source file: *.tar on linux or mac *.zip on windows
|
||||
#set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}")
|
||||
###################################################################
|
||||
|
||||
###################################################################
|
||||
if(${STATICONLYLIBRARIES})
|
||||
set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF")
|
||||
if (${STATICONLYLIBRARIES})
|
||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF")
|
||||
######### Following describes computer ############
|
||||
## following is optional to describe build ##
|
||||
set(SITE_BUILDNAME_SUFFIX "STATIC")
|
||||
set (SITE_BUILDNAME_SUFFIX "STATIC")
|
||||
endif ()
|
||||
###################################################################
|
||||
#### fortran ####
|
||||
if(${FORTRANLIBRARIES})
|
||||
set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
|
||||
if (${FORTRANLIBRARIES})
|
||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
|
||||
### enable Fortran 2003 depends on HDF5_BUILD_FORTRAN
|
||||
set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=ON")
|
||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=ON")
|
||||
else ()
|
||||
set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
|
||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
|
||||
### enable Fortran 2003 depends on HDF5_BUILD_FORTRAN
|
||||
set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=OFF")
|
||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=OFF")
|
||||
endif ()
|
||||
#### java ####
|
||||
if(${JAVALIBRARIES})
|
||||
set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
|
||||
if (${JAVALIBRARIES})
|
||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
|
||||
else ()
|
||||
set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=OFF")
|
||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=OFF")
|
||||
endif ()
|
||||
|
||||
### change install prefix
|
||||
set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALLDIR}")
|
||||
set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$ENV{CMAKE_CONFIG_TYPE}")
|
||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALLDIR}")
|
||||
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$ENV{CMAKE_CONFIG_TYPE}")
|
||||
|
||||
###################################################################
|
||||
|
||||
if(WIN32)
|
||||
set(BINFILEBASE "HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-win${SITE_OS_BITS}")
|
||||
include(${CTEST_SCRIPT_DIRECTORY}\\HDF5options.cmake)
|
||||
include(${CTEST_SCRIPT_DIRECTORY}\\CTestScript.cmake)
|
||||
if(EXISTS "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.exe")
|
||||
file(COPY "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.exe" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
if (WIN32)
|
||||
set (BINFILEBASE "HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-win${SITE_OS_BITS}")
|
||||
include (${CTEST_SCRIPT_DIRECTORY}\\HDF5options.cmake)
|
||||
include (${CTEST_SCRIPT_DIRECTORY}\\CTestScript.cmake)
|
||||
if (EXISTS "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.exe")
|
||||
file (COPY "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.exe" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
endif ()
|
||||
if(EXISTS "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.msi")
|
||||
file(COPY "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.msi" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
if (EXISTS "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.msi")
|
||||
file (COPY "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.msi" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
endif ()
|
||||
if(EXISTS "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.zip")
|
||||
file(COPY "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.zip" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
if (EXISTS "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.zip")
|
||||
file (COPY "${CTEST_BINARY_DIRECTORY}\\${BINFILEBASE}.zip" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
endif ()
|
||||
else ()
|
||||
set(BINFILEBASE "HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")
|
||||
include(${CTEST_SCRIPT_DIRECTORY}/HDF5options.cmake)
|
||||
include(${CTEST_SCRIPT_DIRECTORY}/CTestScript.cmake)
|
||||
if(APPLE)
|
||||
if(EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.dmg")
|
||||
file(COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.dmg" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
set (BINFILEBASE "HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")
|
||||
include (${CTEST_SCRIPT_DIRECTORY}/HDF5options.cmake)
|
||||
include (${CTEST_SCRIPT_DIRECTORY}/CTestScript.cmake)
|
||||
if (APPLE)
|
||||
if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.dmg")
|
||||
file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.dmg" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
endif ()
|
||||
if(EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.tar.gz")
|
||||
file(COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.tar.gz" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.tar.gz")
|
||||
file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.tar.gz" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
endif ()
|
||||
if(EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.sh")
|
||||
file(COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.sh" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.sh")
|
||||
file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.sh" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
endif ()
|
||||
else ()
|
||||
if(CYGWIN)
|
||||
if(EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.sh")
|
||||
file(COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.sh" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
if (CYGWIN)
|
||||
if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.sh")
|
||||
file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.sh" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
endif ()
|
||||
if(EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.tar.gz")
|
||||
file(COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.tar.gz" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.tar.gz")
|
||||
file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-CYGWIN.tar.gz" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
endif ()
|
||||
else ()
|
||||
if(EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.sh")
|
||||
file(COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.sh" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.sh")
|
||||
file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.sh" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
endif ()
|
||||
if(EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.tar.gz")
|
||||
file(COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.tar.gz" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.tar.gz")
|
||||
file (COPY "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Linux.tar.gz" DESTINATION ${CTEST_SCRIPT_DIRECTORY})
|
||||
endif ()
|
||||
endif ()
|
||||
endif ()
|
||||
@ -945,6 +945,10 @@ HDF5options.cmake:
|
||||
|
||||
### uncomment/comment and change the following lines for other configuration options
|
||||
|
||||
#############################################################################################
|
||||
#### alternate toolsets ####
|
||||
#set(CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 17.0")
|
||||
|
||||
#############################################################################################
|
||||
#### ext libraries ####
|
||||
|
||||
@ -971,7 +975,7 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING
|
||||
### disable packaging
|
||||
|
||||
#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_NO_PACKAGES:BOOL=ON")
|
||||
### Create install package with external libraries (szip, zlib, jpeg)
|
||||
### Create install package with external libraries (szip, zlib)
|
||||
set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON")
|
||||
|
||||
#############################################################################################
|
||||
|
||||
@ -12,11 +12,11 @@ For more details check the HISTORY*.txt files in the HDF5 source.
|
||||
Links to HDF5 1.10.1 source code, documentation, and additional materials can be found on The HDF5 web page at:
|
||||
|
||||
https://support.hdfgroup.org/HDF5/
|
||||
|
||||
|
||||
The HDF5 1.10.1 release can be obtained from:
|
||||
|
||||
https://support.hdfgroup.org/HDF5/release/obtain5110.html
|
||||
|
||||
https://support.hdfgroup.org/HDF5/release/obtain5110.html
|
||||
|
||||
User documentation for the snapshot can be accessed directly at this location:
|
||||
|
||||
https://support.hdfgroup.org/HDF5/doc1.10/
|
||||
@ -54,77 +54,96 @@ New Features
|
||||
|
||||
Configuration:
|
||||
-------------
|
||||
- CMake minimum is now 3.2.2. (ADB 2016/01/10)
|
||||
|
||||
- CMake minimum is now 3.2.2.
|
||||
(ADB 2017/01/10)
|
||||
|
||||
- Tools folder is separated into source and test folders. This
|
||||
allows autotools to skip the make command and just execute
|
||||
the make check command.
|
||||
(HDFFV-9719 ADB 2016/10/27)
|
||||
|
||||
Library:
|
||||
--------
|
||||
-
|
||||
-
|
||||
|
||||
Parallel Library:
|
||||
-----------------
|
||||
-
|
||||
-
|
||||
|
||||
Fortran Library:
|
||||
----------------
|
||||
-
|
||||
-
|
||||
|
||||
C++ Library:
|
||||
------------
|
||||
-
|
||||
-
|
||||
|
||||
Tools:
|
||||
------
|
||||
-
|
||||
-
|
||||
|
||||
High-Level APIs:
|
||||
---------------
|
||||
|
||||
C Packet Table API
|
||||
------------------
|
||||
-
|
||||
-
|
||||
|
||||
Internal header file
|
||||
--------------------
|
||||
-
|
||||
|
||||
|
||||
Documentation
|
||||
-------------
|
||||
|
||||
Support for new platforms, languages and compilers.
|
||||
=======================================
|
||||
-
|
||||
-
|
||||
|
||||
Bug Fixes since HDF5-1.10.0-patch1 release
|
||||
==================================
|
||||
|
||||
Library
|
||||
-------
|
||||
-
|
||||
- Changed the plugins dlopen option from RTLD_NOW to RTLD_LAZY
|
||||
(PR 201 ADB 2016/12/12)
|
||||
|
||||
Configuration
|
||||
-------------
|
||||
-
|
||||
- Configuration will check for the strtoll and strtoull functions
|
||||
before using alternatives
|
||||
(PR 340 ADB 2017/03/17)
|
||||
|
||||
- CMake uses a Windows pdb directory variable if available and
|
||||
will generate both static and shared pdb files.
|
||||
(HDFFV-9875 ADB 2017/02/06)
|
||||
|
||||
- CMake now builds shared versions of tools.
|
||||
(HDFFV-10123 ADB 2017/02/01)
|
||||
|
||||
Performance
|
||||
-------------
|
||||
-
|
||||
|
||||
-
|
||||
|
||||
Fortran
|
||||
--------
|
||||
-
|
||||
-
|
||||
|
||||
Tools
|
||||
-----
|
||||
-
|
||||
- h5diff correctly ignores strpad in comparing strings.
|
||||
(HDFFV-10128 ADB 2017/03/03)
|
||||
|
||||
- h5repack now correctly parses the command line filter options.
|
||||
(HDFFV-10046 ADB 2017/01/24)
|
||||
|
||||
High-Level APIs:
|
||||
------
|
||||
-
|
||||
-
|
||||
|
||||
Fortran High-Level APIs:
|
||||
------
|
||||
-
|
||||
-
|
||||
|
||||
Documentation
|
||||
-------------
|
||||
@ -132,20 +151,20 @@ Bug Fixes since HDF5-1.10.0-patch1 release
|
||||
|
||||
F90 APIs
|
||||
--------
|
||||
-
|
||||
-
|
||||
|
||||
|
||||
C++ APIs
|
||||
--------
|
||||
-
|
||||
|
||||
-
|
||||
|
||||
Testing
|
||||
-------
|
||||
-
|
||||
-
|
||||
|
||||
Supported Platforms
|
||||
===================
|
||||
|
||||
|
||||
Linux 2.6.32-573.22.1.el6 GNU C (gcc), Fortran (gfortran), C++ (g++)
|
||||
#1 SMP x86_64 GNU/Linux compilers:
|
||||
(mayll/platypus) Version 4.4.7 20120313
|
||||
@ -172,7 +191,7 @@ Supported Platforms
|
||||
compilers:
|
||||
Version 15.0.3.187 Build 20150407
|
||||
MPICH 3.1.4 compiled with GCC 4.9.3
|
||||
|
||||
|
||||
SunOS 5.11 32- and 64-bit Sun C 5.12 SunOS_sparc
|
||||
(emu) Sun Fortran 95 8.6 SunOS_sparc
|
||||
Sun C++ 5.12 SunOS_sparc
|
||||
@ -186,11 +205,12 @@ Supported Platforms
|
||||
Windows 7 x64 Visual Studio 2012 w/ Intel Fortran 15 (cmake)
|
||||
Visual Studio 2013 w/ Intel Fortran 15 (cmake)
|
||||
Visual Studio 2015 w/ Intel Fortran 16 (cmake)
|
||||
|
||||
Visual Studio 2015 w/ Intel Parallel Studio 2017 (cmake)
|
||||
|
||||
Windows 10 Visual Studio 2015 w/ Intel Fortran 16 (cmake)
|
||||
|
||||
Windows 10 x64 Visual Studio 2015 w/ Intel Fortran 16 (cmake)
|
||||
|
||||
|
||||
Mac OS X Mt. Lion 10.8.5 Apple clang/clang++ version 5.1 from Xcode 5.1
|
||||
64-bit gfortran GNU Fortran (GCC) 4.8.2
|
||||
(swallow/kite) Intel icc/icpc/ifort version 15.0.3
|
||||
@ -226,7 +246,7 @@ Platform C F90/ F90 C++ zlib SZIP
|
||||
Solaris2.11 32-bit n y/y n y y y
|
||||
Solaris2.11 64-bit n y/n n y y y
|
||||
Windows 7 y y/y n y y y
|
||||
Windows 7 x64 y y/y n y y y
|
||||
Windows 7 x64 y y/y y y y y
|
||||
Windows 7 Cygwin n y/n n y y y
|
||||
Windows 7 x64 Cygwin n y/n n y y y
|
||||
Windows 10 y y/y n y y y
|
||||
@ -291,7 +311,7 @@ The following platforms are not supported but have been tested for this release.
|
||||
GNU Fortran (Ubuntu 5.4.0-6ubuntu1~16.04.2) 5.4.0 20160609
|
||||
(cmake and autotools)
|
||||
|
||||
|
||||
|
||||
Known Problems
|
||||
==============
|
||||
* "make check" fails on CYGWIN when building shared lib files is enabled. The
|
||||
|
||||
@ -221,7 +221,9 @@ NOTE: this file is available at the HDF web site:
|
||||
|
||||
HDF5_Examples.cmake
|
||||
|
||||
|
||||
Also available at the HDF web site is a CMake application framework template.
|
||||
You can quickly add files to the framework and execute the script to compile
|
||||
your application with an installed HDF5 binary.
|
||||
|
||||
========================================================================
|
||||
ctest
|
||||
|
||||
Loading…
Reference in New Issue
Block a user