Merge pull request #19 from hpc-io/develop

Make sure h5bench new configuration framework is installed correctly
hpc-io · Nov 1, 2021 · 1276530 · 1276530
2 parents 934de4f + c5f3ac6
commit 1276530
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -82,13 +82,22 @@ target_link_libraries(h5bench_hdf5_iotest h5bench_util hdf5 z m MPI::MPI_C)
 #	install(TARGET h5bench_vl_stream_lib DESTINATION bin)
 #endif()
 
+configure_file(${CMAKE_SOURCE_DIR}/h5bench ${CMAKE_BINARY_DIR}/h5bench COPYONLY)
+
 # =================================================================
 
 # =========== Install binaries ===========
+install(
+	FILES
+	h5bench
+	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
+	DESTINATION bin
+)
 install(TARGETS 
 	h5bench_write 
 	h5bench_read 
 	h5bench_exerciser 
 	h5bench_hdf5_iotest 
 	#h5bench_vl_stream_hl
 	DESTINATION bin)
+
diff --git a/h5bench b/h5bench
@@ -17,10 +17,10 @@ import logging.handlers
 class H5bench:
     """H5bench benchmark suite."""
 
-    H5BENCH_PATTERNS_WRITE = 'build/h5bench_write'
-    H5BENCH_PATTERNS_READ = 'build/h5bench_read'
-    H5BENCH_EXERCISER = 'build/h5bench_exerciser'
-    H5BENCH_METADATA = 'build/h5bench_hdf5_iotest'
+    H5BENCH_PATTERNS_WRITE = 'h5bench_write'
+    H5BENCH_PATTERNS_READ = 'h5bench_read'
+    H5BENCH_EXERCISER = 'h5bench_exerciser'
+    H5BENCH_METADATA = 'h5bench_hdf5_iotest'
 
     def __init__(self, setup, abort, debug):
         """Initialize the suite."""