From a7d74160d043310d3819692c0aff5074bf466b1a Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 26 Jul 2019 16:18:39 -0500
Subject: Correct generator and add HD prefix

---
 hl/test/test_ds.c              |  6 +++---
 tools/test/misc/CMakeLists.txt | 18 ++++--------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index d7af9e9..6c75423 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -4876,12 +4876,12 @@ static int read_data( const char* fname,
 
     for(i=0, nelms=1; i < ndims; i++) {
         if(fscanf( f, "%s %u", str, &j) && HDferror(f)) {
-            printf( "fscanf error in file %s\n", data_file );
+            HDprintf( "fscanf error in file %s\n", data_file );
             HDfclose(f);
             return -1;
         } /* end if */
         if(fscanf( f, "%d",&n ) < 0 && HDferror(f)) {
-            printf( "fscanf error in file %s\n", data_file );
+            HDprintf( "fscanf error in file %s\n", data_file );
             HDfclose(f);
             return -1;
         } /* end if */
@@ -4899,7 +4899,7 @@ static int read_data( const char* fname,
 
     for(j = 0; j < nelms; j++) {
         if(fscanf( f, "%f",&val ) < 0 && HDferror(f)) {
-            printf( "fscanf error in file %s\n", data_file );
+            HDprintf( "fscanf error in file %s\n", data_file );
             HDfclose(f);
             return -1;
         } /* end if */
diff --git a/tools/test/misc/CMakeLists.txt b/tools/test/misc/CMakeLists.txt
index a250222..3d63681 100644
--- a/tools/test/misc/CMakeLists.txt
+++ b/tools/test/misc/CMakeLists.txt
@@ -7,25 +7,15 @@ project (HDF5_TOOLS_TEST_MISC C)
 if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
   add_executable (h5repart_gentest ${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/h5repart_gentest.c)
   target_include_directories (h5repart_gentest PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  if (NOT ONLY_SHARED_LIBS)
-    TARGET_C_PROPERTIES (h5repart_gentest STATIC)
-    target_link_libraries (h5repart_gentest PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
-  else ()
-    TARGET_C_PROPERTIES (h5repart_gentest SHARED)
-    target_link_libraries (h5repart_gentest PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET})
-  endif ()
+  TARGET_C_PROPERTIES (h5repart_gentest STATIC)
+  target_link_libraries (h5repart_gentest PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
   set_target_properties (h5repart_gentest PROPERTIES FOLDER generator/tools)
   #add_test (NAME h5repart_gentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repart_gentest>)
 
   add_executable (h5clear_gentest ${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/h5clear_gentest.c)
   target_include_directories (h5clear_gentest PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  if (NOT ONLY_SHARED_LIBS)
-    TARGET_C_PROPERTIES (h5clear_gentest STATIC)
-    target_link_libraries (h5clear_gentest PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
-  else ()
-    TARGET_C_PROPERTIES (h5clear_gentest SHARED)
-    target_link_libraries (h5clear_gentest PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET})
-  endif ()
+  TARGET_C_PROPERTIES (h5clear_gentest STATIC)
+  target_link_libraries (h5clear_gentest PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
   set_target_properties (h5clear_gentest PROPERTIES FOLDER tools)
   #add_test (NAME H5CLEAR-h5clear_gentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5clear_gentest>)
 
-- 
cgit v0.12