[svn-r20153] Move ext lib handling for ext project building to a common macro. Update HDF5 project to use HDFMacros.cmake file. Add test properties for test ordering.

Tested: local linux, windows

1 files changed, 11 insertions, 11 deletions

diff --git a/perform/CMakeLists.txt b/perform/CMakeLists.txt
index 578b5a6..f55888d 100644
--- a/perform/CMakeLists.txt
+++ b/perform/CMakeLists.txt
@@ -33,7 +33,7 @@ SET (h5perf_serial_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/sio_engine.c
 )
 ADD_EXECUTABLE (h5perf_serial ${h5perf_serial_SRCS})
-H5_NAMING (h5perf_serial ${LIB_TYPE})
+TARGET_NAMING (h5perf_serial ${LIB_TYPE})
 TARGET_LINK_LIBRARIES (h5perf_serial ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 
 ADD_TEST (NAME h5perf_serial COMMAND $<TARGET_FILE:h5perf_serial>)
@@ -49,7 +49,7 @@ IF (HDF5_BUILD_PERFORM_STANDALONE)
   SET_PROPERTY (TARGET h5perf_serial_alone 
       APPEND PROPERTY COMPILE_DEFINITIONS STANDALONE
   )
-  H5_NAMING (h5perf_serial_alone ${LIB_TYPE})
+  TARGET_NAMING (h5perf_serial_alone ${LIB_TYPE})
   TARGET_LINK_LIBRARIES (h5perf_serial_alone ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 
   ADD_TEST (NAME h5perf_serial_alone COMMAND $<TARGET_FILE:h5perf_serial_alone>)
@@ -60,7 +60,7 @@ SET (chunk_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/chunk.c
 )
 ADD_EXECUTABLE(chunk ${chunk_SRCS})
-H5_NAMING (chunk ${LIB_TYPE})
+TARGET_NAMING (chunk ${LIB_TYPE})
 TARGET_LINK_LIBRARIES(chunk ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 
 ADD_TEST (NAME chunk COMMAND $<TARGET_FILE:chunk>)
@@ -70,7 +70,7 @@ SET (iopipe_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/iopipe.c
 )
 ADD_EXECUTABLE (iopipe ${iopipe_SRCS})
-H5_NAMING (iopipe ${LIB_TYPE})
+TARGET_NAMING (iopipe ${LIB_TYPE})
 TARGET_LINK_LIBRARIES (iopipe ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 
 ADD_TEST (NAME iopipe COMMAND $<TARGET_FILE:iopipe>)
@@ -80,7 +80,7 @@ SET (overhead_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/overhead.c
 )
 ADD_EXECUTABLE (overhead ${overhead_SRCS})
-H5_NAMING (overhead ${LIB_TYPE})
+TARGET_NAMING (overhead ${LIB_TYPE})
 TARGET_LINK_LIBRARIES (overhead ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 
 ADD_TEST (NAME overhead COMMAND $<TARGET_FILE:overhead>)
@@ -90,7 +90,7 @@ SET (perf_meta_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/perf_meta.c
 )
 ADD_EXECUTABLE (perf_meta ${perf_meta_SRCS})
-H5_NAMING (perf_meta ${LIB_TYPE})
+TARGET_NAMING (perf_meta ${LIB_TYPE})
 TARGET_LINK_LIBRARIES (perf_meta ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
 
 ADD_TEST (NAME perf_meta COMMAND $<TARGET_FILE:perf_meta>)
@@ -100,7 +100,7 @@ SET (zip_perf_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/zip_perf.c
 )
 ADD_EXECUTABLE (zip_perf ${zip_perf_SRCS})
-H5_NAMING (zip_perf ${LIB_TYPE})
+TARGET_NAMING (zip_perf ${LIB_TYPE})
 TARGET_LINK_LIBRARIES (zip_perf ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 
 ADD_TEST (NAME zip_perf COMMAND $<TARGET_FILE:zip_perf> "-h")
@@ -113,7 +113,7 @@ IF (H5_HAVE_PARALLEL)
       ${HDF5_PERFORM_SOURCE_DIR}/pio_engine.c
   )
   ADD_EXECUTABLE (h5perf ${h5perf_SRCS})
-  H5_NAMING (h5perf ${LIB_TYPE})
+  TARGET_NAMING (h5perf ${LIB_TYPE})
   TARGET_LINK_LIBRARIES (h5perf ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
 
   ADD_TEST (NAME h5perf COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:h5perf>)
@@ -129,7 +129,7 @@ IF (H5_HAVE_PARALLEL)
     SET_PROPERTY (TARGET h5perf_alone 
         APPEND PROPERTY COMPILE_DEFINITIONS STANDALONE
     )
-    H5_NAMING (h5perf_alone ${LIB_TYPE})
+    TARGET_NAMING (h5perf_alone ${LIB_TYPE})
     TARGET_LINK_LIBRARIES (h5perf_alone ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
 
     ADD_TEST (NAME h5perf_alone COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:h5perf_alone>)
@@ -140,7 +140,7 @@ IF (H5_HAVE_PARALLEL)
       ${HDF5_PERFORM_SOURCE_DIR}/benchpar.c
   )
   ADD_EXECUTABLE (benchpar ${benchpar_SRCS})
-  H5_NAMING (benchpar ${LIB_TYPE})
+  TARGET_NAMING (benchpar ${LIB_TYPE})
   TARGET_LINK_LIBRARIES (benchpar ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
 
   ADD_TEST (NAME benchpar COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:benchpar>)
@@ -150,7 +150,7 @@ IF (H5_HAVE_PARALLEL)
       ${HDF5_PERFORM_SOURCE_DIR}/mpi-perf.c
   )
   ADD_EXECUTABLE (mpi-perf ${mpi-perf_SRCS})
-  H5_NAMING (mpi-perf ${LIB_TYPE})
+  TARGET_NAMING (mpi-perf ${LIB_TYPE})
   TARGET_LINK_LIBRARIES (mpi-perf ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
 
   ADD_TEST (NAME mpi-perf COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:mpi-perf>)