Merge CMake changes from 1.10 to 1.8

1 files changed, 59 insertions, 61 deletions

diff --git a/tools/perform/CMakeLists.txt b/tools/perform/CMakeLists.txt
index afafd42..aa863cb 100644
--- a/tools/perform/CMakeLists.txt
+++ b/tools/perform/CMakeLists.txt
@@ -1,39 +1,30 @@
 cmake_minimum_required (VERSION 3.10)
-PROJECT (HDF5_PERFORM )
-
-#-----------------------------------------------------------------------------
-# Apply Definitions to compiler in this directory and below
-#-----------------------------------------------------------------------------
-add_definitions (${HDF_EXTRA_C_FLAGS})
-
-#-----------------------------------------------------------------------------
-# Setup include Directories
-#-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR})
-INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib )
+project (HDF5_TOOLS_PERFORM C)
 
 # --------------------------------------------------------------------
 # Add the executables
 # --------------------------------------------------------------------
 #-- Adding test for h5perf_serial
-set (h5perf_serial_SRCS
-    ${HDF5_PERFORM_SOURCE_DIR}/sio_perf.c
-    ${HDF5_PERFORM_SOURCE_DIR}/sio_engine.c
+set (h5perf_serial_SOURCES
+    ${HDF5_TOOLS_PERFORM_SOURCE_DIR}/sio_perf.c
+    ${HDF5_TOOLS_PERFORM_SOURCE_DIR}/sio_engine.c
 )
-add_executable (h5perf_serial ${h5perf_serial_SRCS})
-TARGET_C_PROPERTIES (h5perf_serial STATIC " " " ")
-target_link_libraries (h5perf_serial ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
+add_executable (h5perf_serial ${h5perf_serial_SOURCES})
+target_include_directories(h5perf_serial PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+TARGET_C_PROPERTIES (h5perf_serial STATIC)
+target_link_libraries (h5perf_serial PRIVATE ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 set_target_properties (h5perf_serial PROPERTIES FOLDER perform)
 
 if (HDF5_BUILD_PERFORM_STANDALONE)
   #-- Adding test for h5perf_serial_alone
-  set (h5perf_serial_alone_SRCS
-      ${HDF5_PERFORM_SOURCE_DIR}/sio_perf.c
-      ${HDF5_PERFORM_SOURCE_DIR}/sio_engine.c
+  set (h5perf_serial_alone_SOURCES
+      ${HDF5_TOOLS_PERFORM_SOURCE_DIR}/sio_perf.c
+      ${HDF5_TOOLS_PERFORM_SOURCE_DIR}/sio_engine.c
   )
-  add_executable (h5perf_serial_alone ${h5perf_serial_alone_SRCS})
-  TARGET_C_PROPERTIES (h5perf_serial_alone STATIC " " " ")
-  target_link_libraries (h5perf_serial_alone ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
+  add_executable (h5perf_serial_alone ${h5perf_serial_alone_SOURCES})
+  target_include_directories(h5perf_serial_alone PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5perf_serial_alone STATIC)
+  target_link_libraries (h5perf_serial_alone PRIVATE ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
   set_target_properties (h5perf_serial_alone PROPERTIES FOLDER perform)
   set_property (TARGET h5perf_serial_alone
       APPEND PROPERTY COMPILE_DEFINITIONS STANDALONE
@@ -41,72 +32,79 @@ if (HDF5_BUILD_PERFORM_STANDALONE)
 endif ()
 
 #-- Adding test for chunk
-set (chunk_SRCS
-    ${HDF5_PERFORM_SOURCE_DIR}/chunk.c
+set (chunk_SOURCES
+    ${HDF5_TOOLS_PERFORM_SOURCE_DIR}/chunk.c
 )
-ADD_EXECUTABLE(chunk ${chunk_SRCS})
-TARGET_C_PROPERTIES (chunk STATIC " " " ")
-TARGET_LINK_LIBRARIES(chunk ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
+add_executable(chunk ${chunk_SOURCES})
+target_include_directories(chunk PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+TARGET_C_PROPERTIES (chunk STATIC)
+target_link_libraries(chunk PRIVATE ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 set_target_properties (chunk PROPERTIES FOLDER perform)
 
 #-- Adding test for iopipe
-set (iopipe_SRCS
-    ${HDF5_PERFORM_SOURCE_DIR}/iopipe.c
+set (iopipe_SOURCES
+    ${HDF5_TOOLS_PERFORM_SOURCE_DIR}/iopipe.c
 )
-add_executable (iopipe ${iopipe_SRCS})
-TARGET_C_PROPERTIES (iopipe STATIC " " " ")
-target_link_libraries (iopipe ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
+add_executable (iopipe ${iopipe_SOURCES})
+target_include_directories(iopipe PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+TARGET_C_PROPERTIES (iopipe STATIC)
+target_link_libraries (iopipe PRIVATE ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 set_target_properties (iopipe PROPERTIES FOLDER perform)
 
 #-- Adding test for overhead
-set (overhead_SRCS
-    ${HDF5_PERFORM_SOURCE_DIR}/overhead.c
+set (overhead_SOURCES
+    ${HDF5_TOOLS_PERFORM_SOURCE_DIR}/overhead.c
 )
-add_executable (overhead ${overhead_SRCS})
-TARGET_C_PROPERTIES (overhead STATIC " " " ")
-target_link_libraries (overhead ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
+add_executable (overhead ${overhead_SOURCES})
+target_include_directories(overhead PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+TARGET_C_PROPERTIES (overhead STATIC)
+target_link_libraries (overhead PRIVATE ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 set_target_properties (overhead PROPERTIES FOLDER perform)
 
 if (BUILD_TESTING)
 #-- Adding test for perf_meta
-  set (perf_meta_SRCS
-      ${HDF5_PERFORM_SOURCE_DIR}/perf_meta.c
+  set (perf_meta_SOURCES
+      ${HDF5_TOOLS_PERFORM_SOURCE_DIR}/perf_meta.c
   )
-  add_executable (perf_meta ${perf_meta_SRCS})
-  TARGET_C_PROPERTIES (perf_meta STATIC " " " ")
-  target_link_libraries (perf_meta ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+  add_executable (perf_meta ${perf_meta_SOURCES})
+  target_include_directories(perf_meta PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (perf_meta STATIC)
+  target_link_libraries (perf_meta PRIVATE ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
   set_target_properties (perf_meta PROPERTIES FOLDER perform)
 endif ()
 
 #-- Adding test for zip_perf
-set (zip_perf_SRCS
-    ${HDF5_PERFORM_SOURCE_DIR}/zip_perf.c
+set (zip_perf_SOURCES
+    ${HDF5_TOOLS_PERFORM_SOURCE_DIR}/zip_perf.c
 )
-add_executable (zip_perf ${zip_perf_SRCS})
-TARGET_C_PROPERTIES (zip_perf STATIC " " " ")
-target_link_libraries (zip_perf ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+add_executable (zip_perf ${zip_perf_SOURCES})
+target_include_directories(zip_perf PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+TARGET_C_PROPERTIES (zip_perf STATIC)
+target_link_libraries (zip_perf PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (zip_perf PROPERTIES FOLDER perform)
 
 if (H5_HAVE_PARALLEL AND BUILD_TESTING)
   #-- Adding test for h5perf
-  set (h5perf_SRCS
-      ${HDF5_PERFORM_SOURCE_DIR}/pio_perf.c
-      ${HDF5_PERFORM_SOURCE_DIR}/pio_engine.c
+  set (h5perf_SOURCES
+      ${HDF5_TOOLS_PERFORM_SOURCE_DIR}/pio_perf.c
+      ${HDF5_TOOLS_PERFORM_SOURCE_DIR}/pio_engine.c
   )
-  add_executable (h5perf ${h5perf_SRCS})
-  TARGET_C_PROPERTIES (h5perf STATIC " " " ")
-  target_link_libraries (h5perf ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+  add_executable (h5perf ${h5perf_SOURCES})
+  target_include_directories(h5perf PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5perf STATIC)
+  target_link_libraries (h5perf PRIVATE ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
   set_target_properties (h5perf PROPERTIES FOLDER perform)
 
   if (HDF5_BUILD_PERFORM_STANDALONE)
     #-- Adding test for h5perf
-    set (h5perf_alone_SRCS
-        ${HDF5_PERFORM_SOURCE_DIR}/pio_perf.c
-        ${HDF5_PERFORM_SOURCE_DIR}/pio_engine.c
+    set (h5perf_alone_SOURCES
+        ${HDF5_TOOLS_PERFORM_SOURCE_DIR}/pio_perf.c
+        ${HDF5_TOOLS_PERFORM_SOURCE_DIR}/pio_engine.c
     )
-    add_executable (h5perf_alone ${h5perf_alone_SRCS})
-    TARGET_C_PROPERTIES (h5perf_alone STATIC " " " ")
-    target_link_libraries (h5perf_alone ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+    add_executable (h5perf_alone ${h5perf_alone_SOURCES})
+    target_include_directories(h5perf_alone PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+    TARGET_C_PROPERTIES (h5perf_alone STATIC)
+    target_link_libraries (h5perf_alone PRIVATE ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
     set_target_properties (h5perf_alone PROPERTIES FOLDER perform)
     set_property (TARGET h5perf_alone
         APPEND PROPERTY COMPILE_DEFINITIONS STANDALONE