[svn-r23081] ported revisions 22987 to 23080 from the trunk

4 files changed, 76 insertions, 16 deletions

diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 71e8c10..6fca1ae 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -15,6 +15,24 @@
 /* Define if using a Windows compiler (i.e. Visual Studio) */
 #cmakedefine H5_HAVE_VISUAL_STUDIO @H5_HAVE_VISUAL_STUDIO@
 
+/* Defined if HDF5 was built with CMake AND build as a shared library */
+#cmakedefine H5_BUILT_AS_DYNAMIC_LIB @H5_BUILT_AS_DYNAMIC_LIB@
+
+/* Defined if HDF5 was built with CMake AND build as a static library */
+#cmakedefine H5_BUILT_AS_STATIC_LIB @H5_BUILT_AS_STATIC_LIB@
+
+/* Defined if HDF5 CPP  was built with CMake AND build as a shared library  */
+#cmakedefine H5_CPP_BUILT_AS_DYNAMIC_LIB @H5_CPP_BUILT_AS_DYNAMIC_LIB@
+
+/* Defined if HDF5 CPP  was built with CMake AND build as a static library  */
+#cmakedefine H5_CPP_BUILT_AS_STATIC_LIB @H5_CPP_BUILT_AS_STATIC_LIB@
+
+/* Defined if HDF5 HL was built with CMake AND build as a shared library */
+#cmakedefine H5_HL_BUILT_AS_DYNAMIC_LIB @H5_HL_BUILT_AS_DYNAMIC_LIB@
+
+/* Defined if HDF5 HL was built with CMake AND build as a static library */
+#cmakedefine H5_HL_BUILT_AS_STATIC_LIB @H5_HL_BUILT_AS_STATIC_LIB@
+
 /* Define if building universal (internal helper macro) */
 #cmakedefine H5_AC_APPLE_UNIVERSAL_BUILD @H5_AC_APPLE_UNIVERSAL_BUILD@
 
diff --git a/config/cmake/prunTest.cmake b/config/cmake/prunTest.cmake
index 8bcf729..261f8a4 100644
--- a/config/cmake/prunTest.cmake
+++ b/config/cmake/prunTest.cmake
@@ -103,16 +103,30 @@ IF (NOT TEST_SKIP_COMPARE)
   ENDIF (WIN32 AND NOT MINGW)
 
   # now compare the output with the reference
-  EXECUTE_PROCESS (
-      COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/P_${TEST_REFERENCE}
-      RESULT_VARIABLE TEST_RESULT
-  )
+  SET (TEST_RESULT 0)
+  FILE (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
+  LIST (LENGTH "${test_act}" len_act)
+  FILE (STRINGS ${TEST_FOLDER}/P_${TEST_REFERENCE} test_ref)
+  LIST (LENGTH "${test_ref}" len_ref)
+  MATH (EXPR _FP_LEN "${len_ref} - 1")
+  FOREACH (line RANGE 0 ${_FP_LEN})
+    LIST (GET "${test_act}" ${line} str_act)
+    LIST (GET "${test_ref}" ${line} str_ref)
+    STRING (COMPARE NOTEQUAL ${str_act} ${str_ref} str_res)
+    IF (${str_res})
+      SET (TEST_RESULT 1)
+      MESSAGE ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}")
+    ENDIF (${str_res})
+  ENDFOREACH (line RANGE 0 ${_FP_LEN})
+  IF (NOT ${len_act} STREQUAL ${len_ref})
+    SET (TEST_RESULT 1)
+  ENDIF (NOT ${len_act} STREQUAL ${len_ref})
 
   MESSAGE (STATUS "COMPARE Result: ${TEST_RESULT}")
 
   # again, if return value is !=0 scream and shout
   IF (NOT ${TEST_RESULT} STREQUAL 0)
-    MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not match P_${TEST_REFERENCE}")
+    MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_OUTPUT} did not match P_${TEST_REFERENCE}")
   ENDIF (NOT ${TEST_RESULT} STREQUAL 0)
 ENDIF (NOT TEST_SKIP_COMPARE)
 
diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake
index 4738523..78ccf9f 100644
--- a/config/cmake/runTest.cmake
+++ b/config/cmake/runTest.cmake
@@ -108,16 +108,30 @@ IF (NOT TEST_SKIP_COMPARE)
   ENDIF (WIN32 AND NOT MINGW)
 
   # now compare the output with the reference
-  EXECUTE_PROCESS (
-      COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
-      RESULT_VARIABLE TEST_RESULT
-  )
+  SET (TEST_RESULT 0)
+  FILE (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
+  LIST (LENGTH "${test_act}" len_act)
+  FILE (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
+  LIST (LENGTH "${test_ref}" len_ref)
+  MATH (EXPR _FP_LEN "${len_ref} - 1")
+  FOREACH (line RANGE 0 ${_FP_LEN})
+    LIST (GET "${test_act}" ${line} str_act)
+    LIST (GET "${test_ref}" ${line} str_ref)
+    STRING (COMPARE NOTEQUAL ${str_act} ${str_ref} str_res)
+    IF (${str_res})
+      SET (TEST_RESULT 1)
+      MESSAGE ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}")
+    ENDIF (${str_res})
+  ENDFOREACH (line RANGE 0 ${_FP_LEN})
+  IF (NOT ${len_act} STREQUAL ${len_ref})
+    SET (TEST_RESULT 1)
+  ENDIF (NOT ${len_act} STREQUAL ${len_ref})
 
   MESSAGE (STATUS "COMPARE Result: ${TEST_RESULT}")
 
   # again, if return value is !=0 scream and shout
   IF (NOT ${TEST_RESULT} STREQUAL 0)
-    MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not match ${TEST_REFERENCE}")
+    MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_OUTPUT} did not match ${TEST_REFERENCE}")
   ENDIF (NOT ${TEST_RESULT} STREQUAL 0)
   
   IF (TEST_ERRREF)
@@ -127,16 +141,30 @@ IF (NOT TEST_SKIP_COMPARE)
     ENDIF (WIN32 AND NOT MINGW)
 
     # now compare the error output with the error reference
-    EXECUTE_PROCESS (
-        COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT}.err ${TEST_FOLDER}/${TEST_ERRREF}
-        RESULT_VARIABLE TEST_RESULT
-    )
+    SET (TEST_RESULT 0)
+    FILE (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT}.err test_act)
+    LIST (LENGTH "${test_act}" len_act)
+    FILE (STRINGS ${TEST_FOLDER}/${TEST_ERRREF} test_ref)
+    LIST (LENGTH "${test_ref}" len_ref)
+    MATH (EXPR _FP_LEN "${len_ref} - 1")
+    FOREACH (line RANGE 0 ${_FP_LEN})
+      LIST (GET "${test_act}" ${line} str_act)
+      LIST (GET "${test_ref}" ${line} str_ref)
+      STRING (COMPARE NOTEQUAL ${str_act} ${str_ref} str_res)
+      IF (${str_res})
+        SET (TEST_RESULT 1)
+        MESSAGE ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}")
+      ENDIF (${str_res})
+    ENDFOREACH (line RANGE 0 ${_FP_LEN})
+    IF (NOT ${len_act} STREQUAL ${len_ref})
+      SET (TEST_RESULT 1)
+    ENDIF (NOT ${len_act} STREQUAL ${len_ref})
 
     MESSAGE (STATUS "COMPARE Result: ${TEST_RESULT}")
 
     # again, if return value is !=0 scream and shout
     IF (NOT ${TEST_RESULT} STREQUAL 0)
-      MESSAGE (FATAL_ERROR "Failed: The error output of ${TEST_PROGRAM} did not match ${TEST_ERRREF}")
+      MESSAGE (FATAL_ERROR "Failed: The error output of ${TEST_OUTPUT}.err did not match ${TEST_ERRREF}")
     ENDIF (NOT ${TEST_RESULT} STREQUAL 0)
   ENDIF (TEST_ERRREF)
 ENDIF (NOT TEST_SKIP_COMPARE)
diff --git a/config/lt_vers.am b/config/lt_vers.am
index 53af6ed..d0944fa 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -17,7 +17,7 @@
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 122
+LT_VERS_REVISION = 126
 LT_VERS_AGE = 0
 
 ## If the API changes *at all*, increment LT_VERS_INTERFACE and