From 59ad4f6d005e2e9aa3471bd4da46311ad9a51812 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 19 Dec 2014 11:00:50 -0500
Subject: [svn-r25907] Fix CMP0054 warning

---
 config/cmake/ConfigureChecks.cmake | 21 +++++++++++----------
 tools/h5dump/CMakeTestsXML.cmake   |  4 ++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 444ce0b..611b4ee 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -106,15 +106,6 @@ if (WINDOWS)
   set (H5_HAVE_WINDOW_PATH 1)
 endif (WINDOWS)
 
-if (WINDOWS)
-  #-----------------------------------------------------------------------------
-  # These tests need to be manually SET for windows since there is currently
-  # something not quite correct with the actual test implementation. This affects
-  # the 'dt_arith' test and most likely lots of other code
-  # ----------------------------------------------------------------------------
-  set (H5_FP_TO_ULLONG_RIGHT_MAXIMUM "" CACHE INTERNAL "")
-endif (WINDOWS)
-
 # ----------------------------------------------------------------------
 # END of WINDOWS Hard code Values
 # ----------------------------------------------------------------------
@@ -329,7 +320,17 @@ H5ConversionTests (H5_FP_TO_ULLONG_ACCURATE "Checking IF accurately roundup conv
 # where the maximal number for unsigned long long is 0x7fffffffffffffff
 # during conversion.
 #
-H5ConversionTests (H5_FP_TO_ULLONG_RIGHT_MAXIMUM "Checking IF right maximum converting floating-point to unsigned long long values" )
+
+if (WINDOWS)
+  #-----------------------------------------------------------------------------
+  # These tests need to be manually SET for windows since there is currently
+  # something not quite correct with the actual test implementation. This affects
+  # the 'dt_arith' test and most likely lots of other code
+  # ----------------------------------------------------------------------------
+  set (H5_FP_TO_ULLONG_RIGHT_MAXIMUM "" CACHE INTERNAL "")
+else (WINDOWS)
+  H5ConversionTests (H5_FP_TO_ULLONG_RIGHT_MAXIMUM "Checking IF right maximum converting floating-point to unsigned long long values" )
+endif (WINDOWS)
 # ----------------------------------------------------------------------
 # Set the flag to indicate that the machine can accurately convert
 # 'long double' to 'unsigned int' values.  (This flag should be set for
diff --git a/tools/h5dump/CMakeTestsXML.cmake b/tools/h5dump/CMakeTestsXML.cmake
index 0d4e0f4..a939d78 100644
--- a/tools/h5dump/CMakeTestsXML.cmake
+++ b/tools/h5dump/CMakeTestsXML.cmake
@@ -414,9 +414,9 @@
   # The lone colon here confuses some systems (Cray X1).  Skip
   # it if configure detects that this is a problem.
   set (TESTTYPE "TEST")
-  if (NOT "H5_LONE_COLON")
+  if (NOT ${H5_LONE_COLON})
     set (TESTTYPE "SKIP")
-  endif (NOT "H5_LONE_COLON")
+  endif (NOT ${H5_LONE_COLON})
   ADD_XML_SKIP_H5_TEST (tempty-nons.h5 0 ${TESTTYPE} -X : tempty.h5)
 
   ADD_XML_H5_TEST (tempty-nons-2.h5 0 --xml-ns=: tempty.h5)
-- 
cgit v0.12