TRILABS-19 remove add_defintions and use generator expressions

2 files changed, 12 insertions, 18 deletions

diff --git a/tools/test/h5jam/CMakeLists.txt b/tools/test/h5jam/CMakeLists.txt
index 2f01aa3..38713ba 100644
--- a/tools/test/h5jam/CMakeLists.txt
+++ b/tools/test/h5jam/CMakeLists.txt
@@ -6,24 +6,24 @@ project (HDF5_TOOLS_TEST_H5JAM C)
 # --------------------------------------------------------------------
 if (HDF5_BUILD_GENERATORS)
   add_executable (h5jamgentest ${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/h5jamgentest.c)
-  set_property(TARGET h5jamgentest APPEND PROPERTY INCLUDE_DIRECTORIES "${HDF5_SRC_DIR};${HDF5_BINARY_DIR}")
-  TARGET_C_PROPERTIES (testhdf5 STATIC " " " ")
-  target_link_libraries (h5jamgentest ${HDF5_LIB_TARGET})
+  target_include_directories(h5jamgentest PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR}")
+  TARGET_C_PROPERTIES (h5jamgentest STATIC)
+  target_link_libraries (h5jamgentest PRIVATE ${HDF5_LIB_TARGET})
   set_target_properties (h5jamgentest PROPERTIES FOLDER generator/tools)
 
   #add_test (NAME h5jamgentest COMMAND $<TARGET_FILE:h5jamgentest>)
 endif ()
 
 add_executable (getub ${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/getub.c)
-set_property(TARGET getub APPEND PROPERTY INCLUDE_DIRECTORIES "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR}")
-TARGET_C_PROPERTIES (getub STATIC " " " ")
-target_link_libraries (getub  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+target_include_directories(getub PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR}")
+TARGET_C_PROPERTIES (getub STATIC)
+target_link_libraries (getub PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (getub PROPERTIES FOLDER tools)
 
 add_executable (tellub ${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/tellub.c)
-set_property(TARGET tellub APPEND PROPERTY INCLUDE_DIRECTORIES "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR}")
-TARGET_C_PROPERTIES (tellub STATIC " " " ")
-target_link_libraries (tellub  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+target_include_directories(tellub PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR}")
+TARGET_C_PROPERTIES (tellub STATIC)
+target_link_libraries (tellub PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (tellub PROPERTIES FOLDER tools)
 
 include (CMakeTests.cmake)
diff --git a/tools/test/h5jam/h5jamgentest.c b/tools/test/h5jam/h5jamgentest.c
index bd07fb4..1644440 100644
--- a/tools/test/h5jam/h5jamgentest.c
+++ b/tools/test/h5jam/h5jamgentest.c
@@ -270,10 +270,7 @@ gent_ub(const char * filename, size_t ub_size, size_t ub_fill)
   H5Fclose(fid);
 
   /* If a user block is being used, write to it here */
-  if(ub_size > 0)
-  {
-    ssize_t nbytes;
-
+  if(ub_size > 0) {
     HDassert(ub_size <= BUF_SIZE);
 
     fd = HDopen(filename, O_RDWR);
@@ -285,8 +282,7 @@ gent_ub(const char * filename, size_t ub_size, size_t ub_fill)
     for (u = 0; u < ub_fill; u++)
       *bp++ = pattern[u % 10];
 
-    nbytes = HDwrite(fd, buf, ub_size);
-    HDassert(nbytes >= 0);
+    HDwrite(fd, buf, ub_size);
 
     HDclose(fd);
   }
@@ -299,7 +295,6 @@ create_textfile(const char *name, size_t size)
     int fd;
     size_t i;
     char *bp;
-    ssize_t nbytes;
 
     fd = HDcreat(name,0777);
     HDassert(fd >= 0);
@@ -311,8 +306,7 @@ create_textfile(const char *name, size_t size)
     for(i = 0; i < size; i++)
         *bp++ = pattern[i % 10];
 
-    nbytes = HDwrite(fd, buf, size);
-    HDassert(nbytes >= 0);
+    HDwrite(fd, buf, size);
 
     HDfree(buf);