3 files changed, 60 insertions, 23 deletions
diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt
index 23b0db3..1e9682c 100644
--- a/hl/c++/examples/CMakeLists.txt
+++ b/hl/c++/examples/CMakeLists.txt
@@ -10,29 +10,27 @@ INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SRC_DIR}/src)
 # --------------------------------------------------------------------
 #  Add in the examples for the Packet Table codes
 # --------------------------------------------------------------------
-IF (HDF5_BUILD_EXAMPLES)
-  ADD_EXECUTABLE (ptExampleFL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleFL.cpp)
-  H5_NAMING (ptExampleFL)
-  TARGET_WIN_PROPERTIES (ptExampleFL)
-  TARGET_LINK_LIBRARIES (
-      ptExampleFL
-      ${HDF5_HL_CPP_LIB_TARGET}
-      ${HDF5_HL_LIB_TARGET}
-      ${HDF5_LIB_TARGET}
-  )
+ADD_EXECUTABLE (ptExampleFL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleFL.cpp)
+H5_NAMING (ptExampleFL)
+TARGET_WIN_PROPERTIES (ptExampleFL)
+TARGET_LINK_LIBRARIES (
+    ptExampleFL
+    ${HDF5_HL_CPP_LIB_TARGET}
+    ${HDF5_HL_LIB_TARGET}
+    ${HDF5_LIB_TARGET}
+)
 
-  ADD_TEST (NAME cpp_hl_ex_ptExampleFL COMMAND $<TARGET_FILE:ptExampleFL>)
-
-  ADD_EXECUTABLE (ptExampleVL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleVL.cpp)
-  H5_NAMING (ptExampleVL)
-  TARGET_WIN_PROPERTIES (ptExampleVL)
-  TARGET_LINK_LIBRARIES (
-      ptExampleVL
-      ${HDF5_HL_CPP_LIB_TARGET}
-      ${HDF5_HL_LIB_TARGET}
-      ${HDF5_LIB_TARGET}
-  )
+ADD_EXECUTABLE (ptExampleVL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleVL.cpp)
+H5_NAMING (ptExampleVL)
+TARGET_WIN_PROPERTIES (ptExampleVL)
+TARGET_LINK_LIBRARIES (
+    ptExampleVL
+    ${HDF5_HL_CPP_LIB_TARGET}
+    ${HDF5_HL_LIB_TARGET}
+    ${HDF5_LIB_TARGET}
+)
 
+IF (BUILD_TESTING)
+  ADD_TEST (NAME cpp_hl_ex_ptExampleFL COMMAND $<TARGET_FILE:ptExampleFL>)
   ADD_TEST (NAME cpp_hl_ex_ptExampleVL COMMAND $<TARGET_FILE:ptExampleVL>)
-
-ENDIF (HDF5_BUILD_EXAMPLES)
+ENDIF (BUILD_TESTING)
diff --git a/hl/examples/CMakeLists.txt b/hl/examples/CMakeLists.txt
index 227f066..b229aa9 100644
--- a/hl/examples/CMakeLists.txt
+++ b/hl/examples/CMakeLists.txt
@@ -1,6 +1,20 @@
 cmake_minimum_required (VERSION 2.8)
 PROJECT (HDF5_HL_EXAMPLES )
 
+SET (HDF5_TEST_FILES
+)
+
+FOREACH (h5_file ${HDF5_TEST_FILES})
+  SET (dest "${PROJECT_BINARY_DIR}/${h5_file}")
+  #MESSAGE (STATUS " Copying ${h5_file}")
+  ADD_CUSTOM_COMMAND (
+      TARGET     h5dump
+      POST_BUILD
+      COMMAND    ${CMAKE_COMMAND}
+      ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/${h5_file} ${dest}
+  )
+ENDFOREACH (h5_file ${HDF5_TEST_FILES})
+
 #-----------------------------------------------------------------------------
 # Define Sources
 #-----------------------------------------------------------------------------
@@ -32,6 +46,26 @@ FOREACH (example ${examples})
   H5_NAMING (hl_ex_${example})
   TARGET_WIN_PROPERTIES (hl_ex_${example})
   TARGET_LINK_LIBRARIES (hl_ex_${example} ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
+
+  IF (BUILD_TESTING)
+    ADD_TEST (NAME hl_ex_${example} COMMAND $<TARGET_FILE:hl_ex_${example}>)
+  ENDIF (BUILD_TESTING)
 ENDFOREACH (example ${examples})
 
+IF (BUILD_TESTING)
+  SET (HDF5_TEST_FILES
+      image24pixel.txt
+      image8.txt
+  )
 
+  FOREACH (h5_file ${HDF5_TEST_FILES})
+    SET (dest "${PROJECT_BINARY_DIR}/${h5_file}")
+    #MESSAGE (STATUS " Copying ${h5_file}")
+    ADD_CUSTOM_COMMAND (
+        TARGET     hl_ex_ex_ds1
+        POST_BUILD
+        COMMAND    ${CMAKE_COMMAND}
+        ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/${h5_file} ${dest}
+    )
+  ENDFOREACH (h5_file ${HDF5_TEST_FILES})
+ENDIF (BUILD_TESTING)
diff --git a/hl/fortran/examples/CMakeLists.txt b/hl/fortran/examples/CMakeLists.txt
index 5e20da3..7f1dec5 100644
--- a/hl/fortran/examples/CMakeLists.txt
+++ b/hl/fortran/examples/CMakeLists.txt
@@ -26,4 +26,9 @@ FOREACH (example ${examples})
       ${HDF5_LIB_TARGET}
   )
   SET_TARGET_PROPERTIES (hl_f90_ex_${example} PROPERTIES LINKER_LANGUAGE Fortran)
+
+  IF (BUILD_TESTING)
+    ADD_TEST (NAME hl_f90_ex_${example} COMMAND $<TARGET_FILE:hl_f90_ex_${example}>)
+  ENDIF (BUILD_TESTING)
+
 ENDFOREACH (example ${examples})