1 10 merges from develop (#298)
* HDFFV-10865 - merge from dev, HDFArray perf fix. * Remove duplicate setting * Whitespace changes after clang format * Undo version 11 clang format changes * Merge CMake changes from develop * test testing script merge from develop * Update supported platforms
This commit is contained in:
@@ -135,7 +135,9 @@ else ()
|
||||
# so this one is used for a sizeof test.
|
||||
#-----------------------------------------------------------------------------
|
||||
macro (CHECK_FORTRAN_FEATURE FUNCTION CODE VARIABLE)
|
||||
message (STATUS "Testing Fortran ${FUNCTION}")
|
||||
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
|
||||
message (VERBOSE "Testing Fortran ${FUNCTION}")
|
||||
endif ()
|
||||
if (HDF5_REQUIRED_LIBRARIES)
|
||||
set (CHECK_FUNCTION_EXISTS_ADD_LIBRARIES
|
||||
"-DLINK_LIBRARIES:STRING=${HDF5_REQUIRED_LIBRARIES}")
|
||||
@@ -153,13 +155,17 @@ else ()
|
||||
OUTPUT_VARIABLE OUTPUT
|
||||
)
|
||||
|
||||
# message (STATUS "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
|
||||
# message (STATUS "Test result ${OUTPUT}")
|
||||
# message (STATUS "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
|
||||
# if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
|
||||
# message (TRACE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
|
||||
# message (TRACE "Test result ${OUTPUT}")
|
||||
# message (TRACE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
|
||||
# endif ()
|
||||
|
||||
if (${RESULT_VAR})
|
||||
set (${VARIABLE} 1 CACHE INTERNAL "Have Fortran function ${FUNCTION}")
|
||||
message (STATUS "Testing Fortran ${FUNCTION} - OK")
|
||||
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
|
||||
message (VERBOSE "Testing Fortran ${FUNCTION} - OK")
|
||||
endif ()
|
||||
file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
|
||||
"Determining if the Fortran ${FUNCTION} exists passed with the following output:\n"
|
||||
"${OUTPUT}\n\n"
|
||||
|
||||
Reference in New Issue
Block a user