Merge in CMake changes from develop

This commit is contained in:
Allen Byrne
2019-04-04 12:07:50 -05:00
parent 0f859bed9d
commit 7db14a3f2a
42 changed files with 464 additions and 303 deletions

View File

@@ -218,8 +218,8 @@ if (NOT TEST_SKIP_COMPARE)
foreach (line RANGE 0 ${_FP_LEN})
list (GET test_act ${line} str_act)
list (GET test_ref ${line} str_ref)
if (NOT ${str_act} STREQUAL ${str_ref})
if (NOT str_act STREQUAL "")
if (NOT str_act STREQUAL str_ref)
if (str_act)
set (TEST_RESULT 1)
message ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
endif ()
@@ -270,8 +270,8 @@ if (NOT TEST_SKIP_COMPARE)
foreach (line RANGE 0 ${_FP_LEN})
list (GET test_act ${line} str_act)
list (GET test_ref ${line} str_ref)
if (NOT ${str_act} STREQUAL ${str_ref})
if (NOT ${str_act} STREQUAL "")
if (NOT str_act STREQUAL str_ref)
if (str_act)
set (TEST_RESULT 1)
message ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
endif ()