summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2014-12-19 15:14:29 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2014-12-19 15:14:29 (GMT)
commit6b3e39f9e7a0467e955bb943bd8c732d3f18900d (patch)
tree9078df33de1ac9d69afc550a74242050e3fdae4f
parent98958b530a1116d49e418fa9a89ddbae59414729 (diff)
downloadhdf5-6b3e39f9e7a0467e955bb943bd8c732d3f18900d.zip
hdf5-6b3e39f9e7a0467e955bb943bd8c732d3f18900d.tar.gz
hdf5-6b3e39f9e7a0467e955bb943bd8c732d3f18900d.tar.bz2
[svn-r25905] Fix CMP0054 warning
-rw-r--r--config/cmake/ConfigureChecks.cmake21
1 files changed, 11 insertions, 10 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