Merge in CMake changes from develop

2019-04-04 12:07:50 -05:00
parent 0f859bed9d
commit 7db14a3f2a
42 changed files with 464 additions and 303 deletions
--- a/config/cmake_ext_mod/HDFUseCXX.cmake
+++ b/config/cmake_ext_mod/HDFUseCXX.cmake
@@ -96,7 +96,7 @@ endmacro ()
 # Check a bunch of cxx functions
 #-----------------------------------------------------------------------------
 if (CMAKE_CXX_COMPILER_LOADED)
-  foreach (test
+  foreach (cxx_test
      OLD_HEADER_FILENAME
      HDF_NO_NAMESPACE
      HDF_NO_STD
@@ -104,6 +104,6 @@ if (CMAKE_CXX_COMPILER_LOADED)
      NO_STATIC_CAST
      CXX_HAVE_OFFSETOF
  )
-    HDF_CXX_FUNCTION_TEST (${test})
+    HDF_CXX_FUNCTION_TEST (${cxx_test})
  endforeach ()
 endif ()