philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFFV-10398 merge from develop improve CMake code

Browse Source
This commit is contained in:
Allen Byrne
2018-01-30 16:30:17 -06:00
parent edb6fd0cf9
commit 16e649fa0d
26 changed files with 205 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
config/cmake/ConfigureChecks.cmake
View File

@@ -179,7 +179,7 @@ endif ()
# Macro to determine the various conversion capabilities
#-----------------------------------------------------------------------------
macro (H5ConversionTests TEST msg)
if ("${TEST}" MATCHES "^${TEST}$")
if (NOT DEFINED ${TEST})
# message (STATUS "===> ${TEST}")
TRY_RUN (${TEST}_RUN ${TEST}_COMPILE
${CMAKE_BINARY_DIR}
@@ -209,21 +209,6 @@ macro (H5ConversionTests TEST msg)
endif ()
endmacro ()
#-----------------------------------------------------------------------------
# Macro to make some of the conversion tests easier to write/read
#-----------------------------------------------------------------------------
macro (H5MiscConversionTest VAR TEST msg)
if ("${TEST}" MATCHES "^${TEST}$")
if (${VAR})
set (${TEST} 1 CACHE INTERNAL ${msg})
message (STATUS "${msg}... yes")
else ()
set (${TEST} "" CACHE INTERNAL ${msg})
message (STATUS "${msg}... no")
endif ()
endif ()
endmacro ()
#-----------------------------------------------------------------------------
# Check various conversion capabilities
#-----------------------------------------------------------------------------