[svn-r24906] Merge latest CMake changes from trunk.

Tested: local linux

2 files changed, 72 insertions, 72 deletions

diff --git a/perform/CMakeLists.txt b/perform/CMakeLists.txt
index 0a6fa10..df7526e 100644
--- a/perform/CMakeLists.txt
+++ b/perform/CMakeLists.txt
@@ -1,10 +1,10 @@
-cmake_minimum_required (VERSION 2.8.10)
+cmake_minimum_required (VERSION 2.8.11)
 PROJECT (HDF5_PERFORM )
 
 #-----------------------------------------------------------------------------
 # Apply Definitions to compiler in this directory and below
 #-----------------------------------------------------------------------------
-ADD_DEFINITIONS (${HDF5_EXTRA_C_FLAGS})
+add_definitions (${HDF5_EXTRA_C_FLAGS})
 
 #-----------------------------------------------------------------------------
 # Setup include Directories
@@ -16,125 +16,125 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib )
 # Add the executables
 # --------------------------------------------------------------------
 #-- Adding test for h5perf_serial
-SET (h5perf_serial_SRCS
+set (h5perf_serial_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/sio_timer.c
     ${HDF5_PERFORM_SOURCE_DIR}/sio_perf.c
     ${HDF5_PERFORM_SOURCE_DIR}/sio_engine.c
 )
-ADD_EXECUTABLE (h5perf_serial ${h5perf_serial_SRCS})
+add_executable (h5perf_serial ${h5perf_serial_SRCS})
 TARGET_NAMING (h5perf_serial ${LIB_TYPE})
 TARGET_C_PROPERTIES (h5perf_serial " " " ")
-TARGET_LINK_LIBRARIES (h5perf_serial ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
-SET_TARGET_PROPERTIES (h5perf_serial PROPERTIES FOLDER perform)
+target_link_libraries (h5perf_serial ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
+set_target_properties (h5perf_serial PROPERTIES FOLDER perform)
 
-IF (HDF5_BUILD_PERFORM_STANDALONE)
+if (HDF5_BUILD_PERFORM_STANDALONE)
   #-- Adding test for h5perf_serial_alone
-  SET (h5perf_serial_alone_SRCS
+  set (h5perf_serial_alone_SRCS
       ${HDF5_PERFORM_SOURCE_DIR}/sio_timer.c
       ${HDF5_PERFORM_SOURCE_DIR}/sio_perf.c
       ${HDF5_PERFORM_SOURCE_DIR}/sio_engine.c
   )
-  ADD_EXECUTABLE (h5perf_serial_alone ${h5perf_serial_alone_SRCS})
-  SET_PROPERTY (TARGET h5perf_serial_alone 
+  add_executable (h5perf_serial_alone ${h5perf_serial_alone_SRCS})
+  set_property (TARGET h5perf_serial_alone 
       APPEND PROPERTY COMPILE_DEFINITIONS STANDALONE
   )
   TARGET_NAMING (h5perf_serial_alone ${LIB_TYPE})
   TARGET_C_PROPERTIES (h5perf_serial_alone " " " ")
-  TARGET_LINK_LIBRARIES (h5perf_serial_alone ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
-  SET_TARGET_PROPERTIES (h5perf_serial_alone PROPERTIES FOLDER perform)
-ENDIF (HDF5_BUILD_PERFORM_STANDALONE)
+  target_link_libraries (h5perf_serial_alone ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
+  set_target_properties (h5perf_serial_alone PROPERTIES FOLDER perform)
+endif (HDF5_BUILD_PERFORM_STANDALONE)
 
 #-- Adding test for chunk
-SET (chunk_SRCS
+set (chunk_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/chunk.c
 )
 ADD_EXECUTABLE(chunk ${chunk_SRCS})
 TARGET_NAMING (chunk ${LIB_TYPE})
 TARGET_C_PROPERTIES (chunk " " " ")
 TARGET_LINK_LIBRARIES(chunk ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
-SET_TARGET_PROPERTIES (chunk PROPERTIES FOLDER perform)
+set_target_properties (chunk PROPERTIES FOLDER perform)
 
 #-- Adding test for iopipe
-SET (iopipe_SRCS
+set (iopipe_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/iopipe.c
 )
-ADD_EXECUTABLE (iopipe ${iopipe_SRCS})
+add_executable (iopipe ${iopipe_SRCS})
 TARGET_NAMING (iopipe ${LIB_TYPE})
 TARGET_C_PROPERTIES (iopipe " " " ")
-TARGET_LINK_LIBRARIES (iopipe ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
-SET_TARGET_PROPERTIES (iopipe PROPERTIES FOLDER perform)
+target_link_libraries (iopipe ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
+set_target_properties (iopipe PROPERTIES FOLDER perform)
 
 #-- Adding test for overhead
-SET (overhead_SRCS
+set (overhead_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/overhead.c
 )
-ADD_EXECUTABLE (overhead ${overhead_SRCS})
+add_executable (overhead ${overhead_SRCS})
 TARGET_NAMING (overhead ${LIB_TYPE})
 TARGET_C_PROPERTIES (overhead " " " ")
-TARGET_LINK_LIBRARIES (overhead ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
-SET_TARGET_PROPERTIES (overhead PROPERTIES FOLDER perform)
+target_link_libraries (overhead ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
+set_target_properties (overhead PROPERTIES FOLDER perform)
 
 #-- Adding test for perf_meta
-SET (perf_meta_SRCS
+set (perf_meta_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/perf_meta.c
 )
-ADD_EXECUTABLE (perf_meta ${perf_meta_SRCS})
+add_executable (perf_meta ${perf_meta_SRCS})
 TARGET_NAMING (perf_meta ${LIB_TYPE})
 TARGET_C_PROPERTIES (perf_meta " " " ")
-TARGET_LINK_LIBRARIES (perf_meta ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
-SET_TARGET_PROPERTIES (perf_meta PROPERTIES FOLDER perform)
+target_link_libraries (perf_meta ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+set_target_properties (perf_meta PROPERTIES FOLDER perform)
 
 #-- Adding test for zip_perf
-SET (zip_perf_SRCS
+set (zip_perf_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/zip_perf.c
 )
-ADD_EXECUTABLE (zip_perf ${zip_perf_SRCS})
+add_executable (zip_perf ${zip_perf_SRCS})
 TARGET_NAMING (zip_perf ${LIB_TYPE})
 TARGET_C_PROPERTIES (zip_perf " " " ")
-TARGET_LINK_LIBRARIES (zip_perf ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-SET_TARGET_PROPERTIES (zip_perf PROPERTIES FOLDER perform)
+target_link_libraries (zip_perf ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+set_target_properties (zip_perf PROPERTIES FOLDER perform)
 
-IF (H5_HAVE_PARALLEL)
+if (H5_HAVE_PARALLEL)
   #-- Adding test for h5perf
-  SET (h5perf_SRCS
+  set (h5perf_SRCS
       ${HDF5_PERFORM_SOURCE_DIR}/pio_timer.c
       ${HDF5_PERFORM_SOURCE_DIR}/pio_perf.c
       ${HDF5_PERFORM_SOURCE_DIR}/pio_engine.c
   )
-  ADD_EXECUTABLE (h5perf ${h5perf_SRCS})
+  add_executable (h5perf ${h5perf_SRCS})
   TARGET_NAMING (h5perf ${LIB_TYPE})
   TARGET_C_PROPERTIES (h5perf " " " ")
-  TARGET_LINK_LIBRARIES (h5perf ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
-  SET_TARGET_PROPERTIES (h5perf PROPERTIES FOLDER perform)
+  target_link_libraries (h5perf ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+  set_target_properties (h5perf PROPERTIES FOLDER perform)
 
-  IF (HDF5_BUILD_PERFORM_STANDALONE)
+  if (HDF5_BUILD_PERFORM_STANDALONE)
     #-- Adding test for h5perf
-    SET (h5perf_alone_SRCS
+    set (h5perf_alone_SRCS
         ${HDF5_PERFORM_SOURCE_DIR}/pio_timer.c
         ${HDF5_PERFORM_SOURCE_DIR}/pio_perf.c
         ${HDF5_PERFORM_SOURCE_DIR}/pio_engine.c
     )
-    ADD_EXECUTABLE (h5perf_alone ${h5perf_alone_SRCS})
-    SET_PROPERTY (TARGET h5perf_alone 
+    add_executable (h5perf_alone ${h5perf_alone_SRCS})
+    set_property (TARGET h5perf_alone 
         APPEND PROPERTY COMPILE_DEFINITIONS STANDALONE
     )
     TARGET_NAMING (h5perf_alone ${LIB_TYPE})
     TARGET_C_PROPERTIES (h5perf_alone " " " ")
-    TARGET_LINK_LIBRARIES (h5perf_alone ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
-    SET_TARGET_PROPERTIES (h5perf_alone PROPERTIES FOLDER perform)
-  ENDIF (HDF5_BUILD_PERFORM_STANDALONE)
+    target_link_libraries (h5perf_alone ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+    set_target_properties (h5perf_alone PROPERTIES FOLDER perform)
+  endif (HDF5_BUILD_PERFORM_STANDALONE)
 
-  IF (HDF5_BUILD_PARALLEL_ALL)
+  if (HDF5_BUILD_PARALLEL_ALL)
     #-- Adding test for benchpar
-    SET (benchpar_SRCS
+    set (benchpar_SRCS
         ${HDF5_PERFORM_SOURCE_DIR}/benchpar.c
     )
-    ADD_EXECUTABLE (benchpar ${benchpar_SRCS})
+    add_executable (benchpar ${benchpar_SRCS})
     TARGET_NAMING (benchpar ${LIB_TYPE})
     TARGET_C_PROPERTIES (benchpar " " " ")
-    TARGET_LINK_LIBRARIES (benchpar ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
-    SET_TARGET_PROPERTIES (benchpar PROPERTIES FOLDER perform)
-  ENDIF (HDF5_BUILD_PARALLEL_ALL)
-ENDIF (H5_HAVE_PARALLEL)
+    target_link_libraries (benchpar ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+    set_target_properties (benchpar PROPERTIES FOLDER perform)
+  endif (HDF5_BUILD_PARALLEL_ALL)
+endif (H5_HAVE_PARALLEL)
 
-INCLUDE (CMakeTests.cmake)
+include (CMakeTests.cmake)
diff --git a/perform/CMakeTests.cmake b/perform/CMakeTests.cmake
index fab6ab2..f8a5846 100644
--- a/perform/CMakeTests.cmake
+++ b/perform/CMakeTests.cmake
@@ -5,7 +5,7 @@
 ##############################################################################
 ##############################################################################
 
-ADD_CUSTOM_COMMAND (
+add_custom_command (
     TARGET     zip_perf
     POST_BUILD
     COMMAND    ${CMAKE_COMMAND}
@@ -17,7 +17,7 @@ ADD_CUSTOM_COMMAND (
 #-----------------------------------------------------------------------------
 
 # Remove any output file left over from previous test run
-ADD_TEST (
+add_test (
     NAME PERFORM_h5perform-clear-objects
     COMMAND    ${CMAKE_COMMAND}
         -E remove 
@@ -31,31 +31,31 @@ ADD_TEST (
         x-gnuplot
 )
 
-ADD_TEST (NAME PERFORM_h5perf_serial COMMAND $<TARGET_FILE:h5perf_serial>)
+add_test (NAME PERFORM_h5perf_serial COMMAND $<TARGET_FILE:h5perf_serial>)
 
-IF (HDF5_BUILD_PERFORM_STANDALONE)
-  ADD_TEST (NAME PERFORM_h5perf_serial_alone COMMAND $<TARGET_FILE:h5perf_serial_alone>)
-ENDIF (HDF5_BUILD_PERFORM_STANDALONE)
+if (HDF5_BUILD_PERFORM_STANDALONE)
+  add_test (NAME PERFORM_h5perf_serial_alone COMMAND $<TARGET_FILE:h5perf_serial_alone>)
+endif (HDF5_BUILD_PERFORM_STANDALONE)
 
-ADD_TEST (NAME PERFORM_chunk COMMAND $<TARGET_FILE:chunk>)
+add_test (NAME PERFORM_chunk COMMAND $<TARGET_FILE:chunk>)
 
-ADD_TEST (NAME PERFORM_iopipe COMMAND $<TARGET_FILE:iopipe>)
+add_test (NAME PERFORM_iopipe COMMAND $<TARGET_FILE:iopipe>)
 
-ADD_TEST (NAME PERFORM_overhead COMMAND $<TARGET_FILE:overhead>)
+add_test (NAME PERFORM_overhead COMMAND $<TARGET_FILE:overhead>)
 
-ADD_TEST (NAME PERFORM_perf_meta COMMAND $<TARGET_FILE:perf_meta>)
+add_test (NAME PERFORM_perf_meta COMMAND $<TARGET_FILE:perf_meta>)
 
-ADD_TEST (NAME PERFORM_zip_perf_help COMMAND $<TARGET_FILE:zip_perf> "-h")
-ADD_TEST (NAME PERFORM_zip_perf COMMAND $<TARGET_FILE:zip_perf> tfilters.h5)
+add_test (NAME PERFORM_zip_perf_help COMMAND $<TARGET_FILE:zip_perf> "-h")
+add_test (NAME PERFORM_zip_perf COMMAND $<TARGET_FILE:zip_perf> tfilters.h5)
 
-IF (H5_HAVE_PARALLEL)
-  ADD_TEST (NAME PERFORM_h5perf COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:h5perf>)
+if (H5_HAVE_PARALLEL)
+  add_test (NAME PERFORM_h5perf COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:h5perf>)
 
-  IF (HDF5_BUILD_PERFORM_STANDALONE)
-    ADD_TEST (NAME PERFORM_h5perf_alone COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:h5perf_alone>)
-  ENDIF (HDF5_BUILD_PERFORM_STANDALONE)
+  if (HDF5_BUILD_PERFORM_STANDALONE)
+    add_test (NAME PERFORM_h5perf_alone COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:h5perf_alone>)
+  endif (HDF5_BUILD_PERFORM_STANDALONE)
 
-  IF (HDF5_BUILD_PARALLEL_ALL)
-    ADD_TEST (NAME PERFORM_benchpar COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:benchpar>)
-  ENDIF (HDF5_BUILD_PARALLEL_ALL)
-ENDIF (H5_HAVE_PARALLEL)
+  if (HDF5_BUILD_PARALLEL_ALL)
+    add_test (NAME PERFORM_benchpar COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:benchpar>)
+  endif (HDF5_BUILD_PARALLEL_ALL)
+endif (H5_HAVE_PARALLEL)