1 12 merge of changes from dev (#271)

* OESS-98 fix tools test for plugins

* sync fork

* Merge of changes from dev

* Move problem option to bottom of the list until fixed

* HDFFV-11106 - fix parsing optional args

* HDFFV-11106 add note

* grammer fix
This commit is contained in:
Allen Byrne
2021-01-19 16:39:23 -06:00
committed by GitHub
parent a63a1c8a57
commit a0ee1eb5dc
35 changed files with 410 additions and 250 deletions

View File

@@ -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"