1 files changed, 34 insertions, 50 deletions
diff --git a/config/cmake/fileCompareTest.cmake b/config/cmake/fileCompareTest.cmake
index 4a8dc09..18a29d9 100644
--- a/config/cmake/fileCompareTest.cmake
+++ b/config/cmake/fileCompareTest.cmake
@@ -46,66 +46,50 @@ if (TEST_STRINGS STREQUAL "YES")
 
   # now compare the outputs
   execute_process (
-      COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${TEST_FOLDER}/${TEST_ONEFILE} ${TEST_FOLDER}/${TEST_TWOFILE}
+      COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_FOLDER}/${TEST_ONEFILE} ${TEST_FOLDER}/${TEST_TWOFILE}
       RESULT_VARIABLE TEST_RESULT
   )
 
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-    message (VERBOSE "COMPARE Result: ${TEST_RESULT}: ${TEST_STRING_SIZE}=${TEST_U_STRING_LEN}-${TEST_O_STRING_LEN}")
-  endif ()
+  message (VERBOSE "COMPARE Result: ${TEST_RESULT}: ${TEST_STRING_SIZE}=${TEST_U_STRING_LEN}-${TEST_O_STRING_LEN}")
   # if the return value is !=${TEST_EXPECT} bail out
   if (NOT TEST_RESULT EQUAL TEST_EXPECT)
     message (FATAL_ERROR "Failed: The output of ${TEST_FOLDER}/${TEST_ONEFILE} did not match ${TEST_FOLDER}/${TEST_TWOFILE}.\n${TEST_ERROR}")
   endif ()
 else ()
-  if (CMAKE_VERSION VERSION_LESS "3.14.0")
-    message (FATAL_ERROR "CANNOT get file size, file command SIZE not supported")
-  else ()
-    file (SIZE ${TEST_FOLDER}/${TEST_ONEFILE} TEST_ONE_SIZE)
-    file (SIZE ${TEST_FOLDER}/${TEST_TWOFILE} TEST_TWO_SIZE)
-    if (TEST_FUNCTION MATCHES "LT")
-      if (TEST_ONE_SIZE LESS TEST_TWO_SIZE)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less ${TEST_FOLDER}/${TEST_TWOFILE}")
-        endif ()
-      else ()
-        message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less ${TEST_FOLDER}/${TEST_TWOFILE}")
-      endif ()
-    elseif (TEST_FUNCTION MATCHES "LTEQ")
-      if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSES "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
-        endif ()
-      else ()
-        message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
-      endif ()
-    elseif (TEST_FUNCTION MATCHES "EQ")
-      if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was equal ${TEST_FOLDER}/${TEST_TWOFILE}")
-        endif ()
-      else ()
-        message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT equal ${TEST_FOLDER}/${TEST_TWOFILE}")
-      endif ()
-    elseif (TEST_FUNCTION MATCHES "GTEQ")
-      if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was greater or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
-        endif ()
-      else ()
-        message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT greater or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
-      endif ()
-    elseif (TEST_FUNCTION MATCHES "GT")
-      if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was greater ${TEST_FOLDER}/${TEST_TWOFILE}")
-        endif ()
-      else ()
-        message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT greater ${TEST_FOLDER}/${TEST_TWOFILE}")
-      endif ()
+  file (SIZE ${TEST_FOLDER}/${TEST_ONEFILE} TEST_ONE_SIZE)
+  file (SIZE ${TEST_FOLDER}/${TEST_TWOFILE} TEST_TWO_SIZE)
+  if (TEST_FUNCTION MATCHES "LT")
+    if (TEST_ONE_SIZE LESS TEST_TWO_SIZE)
+      message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less ${TEST_FOLDER}/${TEST_TWOFILE}")
+    else ()
+      message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less ${TEST_FOLDER}/${TEST_TWOFILE}")
+    endif ()
+  elseif (TEST_FUNCTION MATCHES "LTEQ")
+    if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
+      message (VERBOSES "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+    else ()
+      message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+    endif ()
+  elseif (TEST_FUNCTION MATCHES "EQ")
+    if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
+      message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was equal ${TEST_FOLDER}/${TEST_TWOFILE}")
     else ()
-      message (FATAL_ERROR "Failed: Incorrect test size compare command provided.\n${TEST_ERROR}")
+      message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT equal ${TEST_FOLDER}/${TEST_TWOFILE}")
     endif ()
+  elseif (TEST_FUNCTION MATCHES "GTEQ")
+    if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
+      message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was greater or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+    else ()
+      message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT greater or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+    endif ()
+  elseif (TEST_FUNCTION MATCHES "GT")
+    if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
+      message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was greater ${TEST_FOLDER}/${TEST_TWOFILE}")
+    else ()
+      message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT greater ${TEST_FOLDER}/${TEST_TWOFILE}")
+    endif ()
+  else ()
+    message (FATAL_ERROR "Failed: Incorrect test size compare command provided.\n${TEST_ERROR}")
   endif ()
 endif ()