HDFFV-9875 Bring changes from develop branch

2 files changed, 40 insertions, 39 deletions

diff --git a/tools/h5jam/CMakeLists.txt b/tools/h5jam/CMakeLists.txt
index c74f7a6..927a64c 100644
--- a/tools/h5jam/CMakeLists.txt
+++ b/tools/h5jam/CMakeLists.txt
@@ -54,11 +54,11 @@ if (BUILD_TESTING)
     set_target_properties (h5jamgentest PROPERTIES FOLDER generator/tools)
 
     #add_test (NAME h5jamgentest COMMAND $<TARGET_FILE:h5jamgentest>)
-  endif (HDF5_BUILD_GENERATORS)
+  endif ()
 
   include (CMakeTests.cmake)
 
-endif (BUILD_TESTING)
+endif ()
 
 ##############################################################################
 ##############################################################################
@@ -69,13 +69,14 @@ endif (BUILD_TESTING)
 #-----------------------------------------------------------------------------
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
+if (HDF5_EXPORTED_TARGETS)
+  INSTALL_PROGRAM_PDB (h5jam ${HDF5_INSTALL_BIN_DIR} toolsapplications)
 
-#INSTALL_PROGRAM_PDB (h5jam ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-
-install (
-    TARGETS
-        h5jam h5unjam
-    EXPORT
-        ${HDF5_EXPORTED_TARGETS}
-    RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications
-)
+  install (
+      TARGETS
+          h5jam h5unjam
+      EXPORT
+          ${HDF5_EXPORTED_TARGETS}
+      RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications
+  )
+endif ()
diff --git a/tools/h5jam/CMakeTests.cmake b/tools/h5jam/CMakeTests.cmake
index 6752c9a..3752e55 100644
--- a/tools/h5jam/CMakeTests.cmake
+++ b/tools/h5jam/CMakeTests.cmake
@@ -23,11 +23,11 @@
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
     HDFTEST_COPY_FILE("${HDF5_TOOLS_H5JAM_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5jam_files")
-  endforeach (h5_file ${HDF5_REFERENCE_TEST_FILES})
+  endforeach ()
 
   foreach (txt_file ${HDF5_REFERENCE_TXT_FILES})
     HDFTEST_COPY_FILE("${HDF5_TOOLS_H5JAM_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5jam_files")
-  endforeach (txt_file ${HDF5_REFERENCE_TXT_FILES})
+  endforeach ()
   add_custom_target(h5jam_files ALL COMMENT "Copying files needed by h5jam tests" DEPENDS ${h5jam_files_list})
 
 ##############################################################################
@@ -46,8 +46,8 @@
       add_test (NAME H5JAM-${expectfile} COMMAND $<TARGET_FILE:h5jam> ${ARGN})
       if (NOT "${resultcode}" STREQUAL "0")
         set_tests_properties (H5JAM-${expectfile} PROPERTIES WILL_FAIL "true")
-      endif (NOT "${resultcode}" STREQUAL "0")
-    else (HDF5_ENABLE_USING_MEMCHECKER)
+      endif ()
+    else ()
       add_test (
           NAME H5JAM-${expectfile}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
@@ -67,8 +67,8 @@
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
       set_tests_properties (H5JAM-${expectfile} PROPERTIES DEPENDS H5JAM-${expectfile}-clear-objects)
-    endif (HDF5_ENABLE_USING_MEMCHECKER)
-  ENDMACRO (TEST_H5JAM_OUTPUT)
+    endif ()
+  ENDMACRO ()
 
   # ============================================================
   # TEST_H5UNJAM_OUTPUT
@@ -80,8 +80,8 @@
       add_test (NAME H5JAM-UNJAM-${expectfile} COMMAND $<TARGET_FILE:h5unjam> ${ARGN})
       if (NOT "${resultcode}" STREQUAL "0")
         set_tests_properties (H5JAM-UNJAM-${expectfile} PROPERTIES WILL_FAIL "true")
-      endif (NOT "${resultcode}" STREQUAL "0")
-    else (HDF5_ENABLE_USING_MEMCHECKER)
+      endif ()
+    else ()
       add_test (
           NAME H5JAM-UNJAM-${expectfile}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
@@ -101,8 +101,8 @@
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
       set_tests_properties (H5JAM-UNJAM-${expectfile} PROPERTIES DEPENDS H5JAM-UNJAM-${expectfile}-clear-objects)
-    endif (HDF5_ENABLE_USING_MEMCHECKER)
-  ENDMACRO (TEST_H5UNJAM_OUTPUT)
+    endif ()
+  ENDMACRO ()
 
   MACRO (CHECKFILE testname testdepends expected actual)
     # If using memchecker add tests without using scripts
@@ -143,8 +143,8 @@
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
       set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP_CMP PROPERTIES DEPENDS H5JAM-${testname}-CHECKFILE-H5DMP)
-    endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
-  ENDMACRO(CHECKFILE testname testdepends expected actual)
+    endif ()
+  ENDMACRO()
 
   MACRO (UNJAMTEST testname setfile infile ufile chkfile outfile)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
@@ -171,7 +171,7 @@
         add_test (NAME H5JAM-${testname}-UNJAM COMMAND $<TARGET_FILE:h5unjam> -i ${infile} -u ${ufile} -o ${outfile})
         set_tests_properties (H5JAM-${testname}-UNJAM PROPERTIES DEPENDS H5JAM-${testname}-UNJAM_D-clear-objects)
         set (compare_test ${ufile})
-      else (NOT "${ufile}" STREQUAL "NONE")
+      else ()
         if (NOT "${ARGN}" STREQUAL "--delete")
           add_test (
               NAME H5JAM-${testname}-UNJAM_D-clear-objects
@@ -191,12 +191,12 @@
           )
           set_tests_properties (H5JAM-${testname}-UNJAM PROPERTIES DEPENDS H5JAM-${testname}-UNJAM_D-clear-objects)
           set (compare_test "${outfile}.ufile.txt")
-        else (NOT "${ARGN}" STREQUAL "--delete")
+        else ()
           add_test (NAME H5JAM-${testname}-UNJAM COMMAND $<TARGET_FILE:h5unjam> -i ${infile} -o ${outfile})
           set_tests_properties (H5JAM-${testname}-UNJAM PROPERTIES DEPENDS H5JAM-${testname}-UNJAM-clear-objects)
           set (compare_test "")
-        endif (NOT "${ARGN}" STREQUAL "--delete")
-      endif (NOT "${ufile}" STREQUAL "NONE")
+        endif ()
+      endif ()
       if (NOT "${compare_test}" STREQUAL "")
         add_test (
             NAME H5JAM-${testname}-UNJAM-CHECK_UB_1-clear-objects
@@ -221,7 +221,7 @@
                 -P "${HDF_RESOURCES_DIR}/userblockTest.cmake"
         )
         set_tests_properties (H5JAM-${testname}-UNJAM-CHECK_UB_1 PROPERTIES DEPENDS H5JAM-${testname}-UNJAM-CHECK_UB_1-clear-objects)
-      endif (NOT "${compare_test}" STREQUAL "")
+      endif ()
 
       add_test (
           NAME H5JAM-${testname}-UNJAM-CHECK_NOUB
@@ -238,13 +238,13 @@
       )
       if (NOT "${compare_test}" STREQUAL "")
         set_tests_properties (H5JAM-${testname}-UNJAM-CHECK_NOUB PROPERTIES DEPENDS H5JAM-${testname}-UNJAM-CHECK_UB_1)
-      else (NOT "${compare_test}" STREQUAL "")
+      else ()
         set_tests_properties (H5JAM-${testname}-UNJAM-CHECK_NOUB PROPERTIES DEPENDS H5JAM-${testname}-UNJAM)
-      endif (NOT "${compare_test}" STREQUAL "")
+      endif ()
 
       CHECKFILE (${testname} "H5JAM-${testname}-UNJAM-CHECK_NOUB" ${chkfile} ${outfile})
-    endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
-  ENDMACRO(UNJAMTEST testname infile ufile outfile)
+    endif ()
+  ENDMACRO()
 
   MACRO (JAMTEST testname jamfile infile chkfile outfile)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
@@ -252,7 +252,7 @@
           NAME H5JAM-${testname}-clear-objects
           COMMAND ${CMAKE_COMMAND} -E remove ${outfile} ${infile}.cpy.h5
       )
-    endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
+    endif ()
     add_test (NAME H5JAM-${testname} COMMAND $<TARGET_FILE:h5jam> -u testfiles/${jamfile} -i testfiles/${infile} -o ${outfile} ${ARGN})
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       set_tests_properties (H5JAM-${testname} PROPERTIES DEPENDS H5JAM-${testname}-clear-objects)
@@ -260,7 +260,7 @@
       set (compare_orig testfiles/${infile})
       if ("${ARGN}" STREQUAL "--clobber")
         set (compare_orig "")
-      endif ("${ARGN}" STREQUAL "--clobber")
+      endif ()
 
       add_test (
           NAME H5JAM-${testname}-CHECK_UB_1-clear-objects
@@ -286,8 +286,8 @@
       )
       set_tests_properties (H5JAM-${testname}-CHECK_UB_1 PROPERTIES DEPENDS H5JAM-${testname}-CHECK_UB_1-clear-objects)
       CHECKFILE (${testname} "H5JAM-${testname}-CHECK_UB_1" ${chkfile} ${outfile})
-    endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
-  ENDMACRO (JAMTEST testname jamfile infile outfile)
+    endif ()
+  ENDMACRO ()
 
   MACRO (JAMTEST_NONE testname jamfile infile setfile chkfile)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
@@ -315,7 +315,7 @@
       set (compare_orig ${chkfile}.cpy.h5)
       if ("${ARGN}" STREQUAL "--clobber")
         set (compare_orig "")
-      endif ("${ARGN}" STREQUAL "--clobber")
+      endif ()
 
       add_test (
           NAME H5JAM-${testname}_NONE-CHECK_UB_1-clear-objects
@@ -341,8 +341,8 @@
       )
       set_tests_properties (H5JAM-${testname}_NONE-CHECK_UB_1 PROPERTIES DEPENDS H5JAM-${testname}_NONE-CHECK_UB_1-clear-objects)
       CHECKFILE (${testname} "H5JAM-${testname}_NONE-CHECK_UB_1" ${infile} ${chkfile})
-    endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
-  ENDMACRO (JAMTEST_NONE testname jamfile infile setfile chkfile)
+    endif ()
+  ENDMACRO ()
 
 ##############################################################################
 ##############################################################################