[svn-r29862] Convert source list names from *_SRCS to *_SOURCES.

Add/convert most tools to use new HDF5_TOOLS_DIR instead of HDF5_TOOLS_SRC_DIR CMake VAR.

16 files changed, 530 insertions, 530 deletions

diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt
index 63b9b5d..4c44ac2 100644
--- a/tools/h5copy/CMakeLists.txt
+++ b/tools/h5copy/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_H5COPY)
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
+INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
 
 # --------------------------------------------------------------------
 # Add the h5copy and test executables
diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt
index 59a3241..3902bd4 100644
--- a/tools/h5diff/CMakeLists.txt
+++ b/tools/h5diff/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_H5DIFF)
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
+INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
 
 # --------------------------------------------------------------------
 # Add the h5diff executables
diff --git a/tools/h5diff/CMakeTests.cmake b/tools/h5diff/CMakeTests.cmake
index c815325..7698cc1 100644
--- a/tools/h5diff/CMakeTests.cmake
+++ b/tools/h5diff/CMakeTests.cmake
@@ -51,29 +51,29 @@
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/non_comparables1.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/non_comparables2.h5
       # tools/testfiles/vds
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_a.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_b.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_c.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_d.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_e.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_f.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/1_vds.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_a.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_b.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_c.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_d.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_e.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/2_vds.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/3_1_vds.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/3_2_vds.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/4_0.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/4_1.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/4_2.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/4_vds.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/5_a.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/5_b.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/5_c.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/5_vds.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/1_a.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/1_b.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/1_c.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/1_d.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/1_e.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/1_f.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/1_vds.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/2_a.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/2_b.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/2_c.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/2_d.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/2_e.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/2_vds.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/3_1_vds.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/3_2_vds.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/4_0.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/4_1.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/4_2.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/4_vds.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/5_a.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/5_b.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/5_c.h5
+      ${HDF5_TOOLS_DIR}/testfiles/vds/5_vds.h5
   )
 
   set (LIST_OTHER_TEST_FILES
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt
index be08e2a..7b32e8b 100644
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_H5DUMP)
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
+INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
 
 # --------------------------------------------------------------------
 # Add the h5dump executables
diff --git a/tools/h5dump/CMakeTests.cmake b/tools/h5dump/CMakeTests.cmake
index 7897311..346ab60 100644
--- a/tools/h5dump/CMakeTests.cmake
+++ b/tools/h5dump/CMakeTests.cmake
@@ -9,177 +9,177 @@
   # Copy all the HDF5 files from the test directory into the source directory
   # --------------------------------------------------------------------
   set (HDF5_REFERENCE_FILES
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/charsets.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/file_space.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/filter_fail.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/non_existing.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/packedbits.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-2A.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-2A0.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-2B.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-3.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-4s.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-5s.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-6.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-7.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-7N.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tallfilters.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1_big.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray3.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray4.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray5.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray6.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray7.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray8.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr-1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr-2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr-3.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr-4_be.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrcontents1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrcontents2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrintsize.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrreg.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrregR.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tbin1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tbin1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tbin2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tbin3.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tbin4.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tbinregR.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tbigdims.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tbitnopaque.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tboot1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tboot2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tboot2A.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tboot2B.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tchar1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tchunked.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdattrintsize.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdintarray.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdints.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdintsize.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcomp-1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcomp-2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcomp-3.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcomp-4.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompact.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcontents.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcontiguos.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdatareg.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdataregR.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdeflate.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset-1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset-2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset-3s.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/texceedsubstart.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/texceedsubcount.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/texceedsubstride.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/texceedsubblock.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/texternal.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinkfar.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlink.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfill.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfletcher32.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfpformat.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrp_comments.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-3.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-4.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-5.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/thyperslab.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicesno.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicessub1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicessub2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicessub3.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicessub4.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tindicesyes.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dims.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dimsBlock2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dimsBlockEq.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dimsCount2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dimsCountEq.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dimsStride2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tintsattrs.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tlarge_objname.ddl
-      #${HDF5_TOOLS_SRC_DIR}/testfiles/tldouble.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tlonglinks.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop-1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tmulti.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tmultifile.ddl
-      #${HDF5_TOOLS_SRC_DIR}/testfiles/tqmarkfile.ddl
-      #${HDF5_TOOLS_SRC_DIR}/testfiles/tstarfile.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnamed_dtype_attr.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcmpddt.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnbit.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnoattrdata.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnoattrddl.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnodata.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnoddl.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnoddlfile.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tno-subset.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnullspace.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tordergr1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tordergr2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tordergr3.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tordergr4.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tordergr5.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr3.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr4.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tordercontents1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tordercontents2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/torderlinks1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/torderlinks2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tperror.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/trawdatafile.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/trawssetfile.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/treadfilter.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/treadintfilter.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/treference.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsaf.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarattrintsize.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarintattrsize.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarintsize.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarstring.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tscaleoffset.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tshuffle.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink-1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink-2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink-D.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsplit_file.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr-1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr-2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstring.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstring2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstringe.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tszip.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tudlink-1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tudlink-2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tuserfilter.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes3.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes4.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes5.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvlstr.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvms.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/twidedisplay.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/twithddlfile.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/h5dump-help.txt
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/out3.h5import
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/zerodim.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/charsets.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/file_space.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/filter_fail.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/non_existing.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/packedbits.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tall-1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tall-2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tall-2A.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tall-2A0.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tall-2B.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tall-3.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tall-4s.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tall-5s.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tall-6.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tall-7.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tall-7N.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tallfilters.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tarray1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tarray1_big.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tarray2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tarray3.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tarray4.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tarray5.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tarray6.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tarray7.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tarray8.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tattr-1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tattr-2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tattr-3.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tattr-4_be.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tattrcontents1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tattrcontents2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tattrintsize.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tattrreg.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tattrregR.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tbin2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tbin3.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tbin4.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tbinregR.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tbigdims.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tboot1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tboot2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tboot2A.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tboot2B.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tchar1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tchunked.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tcmpdattrintsize.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tcmpdintarray.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tcmpdints.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tcmpdintsize.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tcomp-1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tcomp-2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tcomp-3.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tcomp-4.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tcompact.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tcontents.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tcontiguos.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tdataregR.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tdeflate.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tdset-1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tdset-2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tdset-3s.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tempty.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/texceedsubstart.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/texceedsubcount.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/texceedsubstride.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/texceedsubblock.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/texternal.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/textlink.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tfamily.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tfill.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tfletcher32.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tfpformat.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tgroup-1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tgroup-2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/thlink-1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/thlink-2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/thlink-3.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/thlink-4.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/thlink-5.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/thyperslab.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tindicesno.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tindicessub1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tindicessub2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tindicessub3.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tindicessub4.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tindicesyes.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tints4dims.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tints4dimsBlock2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tints4dimsBlockEq.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tints4dimsCount2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tints4dimsCountEq.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tints4dimsStride2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tintsattrs.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tlarge_objname.ddl
+      #${HDF5_TOOLS_DIR}/testfiles/tldouble.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tlonglinks.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tloop-1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tmulti.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tmultifile.ddl
+      #${HDF5_TOOLS_DIR}/testfiles/tqmarkfile.ddl
+      #${HDF5_TOOLS_DIR}/testfiles/tstarfile.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tnestedcmpddt.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tnbit.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tnoattrdata.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tnoattrddl.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tnodata.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tnoddl.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tnoddlfile.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tno-subset.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tnullspace.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tordergr1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tordergr2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tordergr3.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tordergr4.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tordergr5.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/torderattr1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/torderattr2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/torderattr3.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/torderattr4.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tordercontents1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tordercontents2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/torderlinks1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/torderlinks2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tperror.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/trawdatafile.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/trawssetfile.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/treadfilter.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/treadintfilter.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/treference.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tsaf.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tscalarattrintsize.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tscalarintattrsize.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tscalarintsize.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tscalarstring.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tscaleoffset.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tshuffle.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tslink-1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tslink-2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tslink-D.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tsplit_file.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tstr-1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tstr-2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tstring.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tstring2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tstringe.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tszip.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tudlink-1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tudlink-2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tuserfilter.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tvlstr.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tvms.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/twidedisplay.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/twithddlfile.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/h5dump-help.txt
+      ${HDF5_TOOLS_DIR}/testfiles/out3.h5import
+      ${HDF5_TOOLS_DIR}/testfiles/zerodim.ddl
   )
   set (HDF5_REFERENCE_EXP_FILES
       tall-6.exp
@@ -192,103 +192,103 @@
       twithddlfile.exp
   )
   set (HDF5_REFERENCE_TEST_FILES
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/charsets.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/file_space.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/filter_fail.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/packedbits.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/taindices.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1_big.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray2.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray3.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray4.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray5.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray6.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray7.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray8.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr2.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr4_be.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrintsize.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrreg.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tbigdims.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tbinary.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tbitnopaque.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tchar.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdattrintsize.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdintarray.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdints.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdintsize.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound_complex.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdatareg.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinkfar.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinktar.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlink.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00000.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00001.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00002.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00003.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00004.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00005.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00006.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00007.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00008.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00009.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfamily00010.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfcontents1.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfcontents2.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfilters.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfpformat.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfvalues.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrp_comments.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/thyperslab.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dims.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tintsattrs.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tlarge_objname.h5
-      #${HDF5_TOOLS_SRC_DIR}/testfiles/tldouble.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tlonglinks.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tmulti-b.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tmulti-g.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tmulti-l.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tmulti-o.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tmulti-r.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tmulti-s.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnamed_dtype_attr.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcomp.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcmpddt.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tno-subset.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnullspace.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tordergr.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsaf.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarattrintsize.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarintattrsize.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarintsize.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tscalarstring.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsplit_file-m.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsplit_file-r.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr2.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr3.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tudlink.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes1.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes2.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes3.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes4.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes5.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvlstr.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvms.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/zerodim.h5
+      ${HDF5_TOOLS_DIR}/testfiles/charsets.h5
+      ${HDF5_TOOLS_DIR}/testfiles/file_space.h5
+      ${HDF5_TOOLS_DIR}/testfiles/filter_fail.h5
+      ${HDF5_TOOLS_DIR}/testfiles/packedbits.h5
+      ${HDF5_TOOLS_DIR}/testfiles/taindices.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tall.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tarray1_big.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tarray4.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tarray5.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tarray8.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tattr.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tattr2.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tattr4_be.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tattrintsize.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tbigdims.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tbinary.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tchar.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tcmpdattrintsize.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tcmpdintarray.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tcmpdints.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tcmpdintsize.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tdset.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tempty.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5
+      ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.h5
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5
+      ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5
+      ${HDF5_TOOLS_DIR}/testfiles/textlink.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfamily00000.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfamily00001.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfamily00002.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfamily00003.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfamily00004.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfamily00005.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfamily00006.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfamily00007.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfamily00008.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfamily00009.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfamily00010.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfcontents1.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfcontents2.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfilters.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfvalues.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.h5
+      ${HDF5_TOOLS_DIR}/testfiles/thlink.h5
+      ${HDF5_TOOLS_DIR}/testfiles/thyperslab.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tints4dims.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tintsattrs.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tlarge_objname.h5
+      #${HDF5_TOOLS_DIR}/testfiles/tldouble.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tlonglinks.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tloop.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tmulti-b.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tmulti-g.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tmulti-l.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tmulti-o.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tmulti-r.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tmulti-s.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tnestedcmpddt.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tno-subset.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tnullspace.h5
+      ${HDF5_TOOLS_DIR}/testfiles/torderattr.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tordergr.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tscalarattrintsize.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tscalarintattrsize.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tscalarintsize.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tscalarstring.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tslink.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tsplit_file-m.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tsplit_file-r.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tstr.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tstr3.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tvms.h5
+      ${HDF5_TOOLS_DIR}/testfiles/zerodim.h5
   )
   set (HDF5_ERROR_REFERENCE_TEST_FILES
       ${PROJECT_SOURCE_DIR}/errfiles/filter_fail.err
diff --git a/tools/h5dump/CMakeTestsPBITS.cmake b/tools/h5dump/CMakeTestsPBITS.cmake
index 745d5b1..14f282a 100644
--- a/tools/h5dump/CMakeTestsPBITS.cmake
+++ b/tools/h5dump/CMakeTestsPBITS.cmake
@@ -65,9 +65,9 @@
       tpbitsUnsignedLongLong16.ddl
   )
   set (HDF5_REFERENCE_TEST_PBITS
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/packedbits.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound.h5
+      ${HDF5_TOOLS_DIR}/testfiles/packedbits.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5
   )
   set (HDF5_ERROR_REFERENCE_PBITS
       tnofilename-with-packed-bits.err
diff --git a/tools/h5dump/CMakeTestsXML.cmake b/tools/h5dump/CMakeTestsXML.cmake
index fc6cae7..afb1df6 100644
--- a/tools/h5dump/CMakeTestsXML.cmake
+++ b/tools/h5dump/CMakeTestsXML.cmake
@@ -9,122 +9,122 @@
   # copy XML test files from source dir to test dir
   #
   set (HDF5_XML_REFERENCE_TEST_FILES
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray2.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray3.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray6.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray7.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tbitfields.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound2.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound_complex.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdatareg.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset2.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tenum.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlink.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfpformat.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop2.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tmany.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-amp.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-apos.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-gt.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-lt.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-quot.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-sp.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnamed_dtype_attr.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcomp.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnodata.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tobjref.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/topaque.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tref.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tref-escapes.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tref-escapes-at.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsaf.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstring.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstring-at.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr2.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tudlink.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes1.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes2.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes3.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes4.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes5.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvlstr.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tall.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tattr.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tbitfields.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tcompound2.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tdset.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tdset2.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tempty.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tenum.h5
+      ${HDF5_TOOLS_DIR}/testfiles/textlink.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5
+      ${HDF5_TOOLS_DIR}/testfiles/thlink.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tloop.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tloop2.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tmany.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tname-amp.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tname-apos.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tname-gt.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tname-lt.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tname-quot.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tname-sp.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tnodata.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tobjref.h5
+      ${HDF5_TOOLS_DIR}/testfiles/topaque.h5
+      ${HDF5_TOOLS_DIR}/testfiles/torderattr.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tref.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tref-escapes.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tref-escapes-at.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tslink.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tstring.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tstring-at.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tstr.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5
   )
   set (HDF5_XML_REFERENCE_FILES
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-2A.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray2.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray3.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray6.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray7.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tbitfields.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound_complex.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound2.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdatareg.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset2.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-dtd.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-dtd-2.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-dtd-uri.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-nons.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-nons-2.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-nons-uri.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-ns.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-ns-2.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tenum.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlink.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tfpformat.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop2.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tmany.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-amp.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-apos.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnamed_dtype_attr.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-gt.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-lt.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-quot.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-sp.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcomp.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnodata.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tobjref.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/topaque.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr1.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr2.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr3.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr4.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tref.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tref-escapes.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tref-escapes-at.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsaf.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr2.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstring.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstring-at.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tudlink.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes1.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes2.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes3.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes4.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes5.h5.xml
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvlstr.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tall.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tall-2A.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tattr.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tbitfields.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tcompound2.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tdset.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tdset2.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tempty.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd-2.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd-uri.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tempty-nons.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tempty-nons-2.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tempty-nons-uri.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tempty-ns.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tempty-ns-2.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tenum.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/textlink.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/thlink.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tloop.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tloop2.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tmany.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tname-amp.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tname-apos.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tname-gt.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tname-lt.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tname-quot.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tname-sp.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tnodata.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tobjref.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/topaque.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/torderattr1.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/torderattr2.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/torderattr3.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/torderattr4.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tref.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tref-escapes.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tref-escapes-at.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tslink.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tstr.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tstring.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tstring-at.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5.xml
   )
 
   foreach (tst_xml_h5_file ${HDF5_XML_REFERENCE_TEST_FILES})
@@ -138,7 +138,7 @@
         ARGS       -E copy_if_different ${tst_xml_h5_file} ${dest}
     )
   endforeach (tst_xml_h5_file ${HDF5_XML_REFERENCE_TEST_FILES})
-  
+
   foreach (tst_xml_other_file ${HDF5_XML_REFERENCE_FILES})
     get_filename_component(fname "${tst_xml_other_file}" NAME)
     set (dest "${PROJECT_BINARY_DIR}/testfiles/xml/${fname}")
@@ -150,7 +150,7 @@
         ARGS       -E copy_if_different ${tst_xml_other_file} ${dest}
     )
   endforeach (tst_xml_other_file ${HDF5_XML_REFERENCE_FILES})
-  
+
 ##############################################################################
 ##############################################################################
 ###           T H E   T E S T S  M A C R O S                               ###
@@ -204,16 +204,16 @@
 
 ##############################################################################
 ##############################################################################
-###           T H E   T E S T S                                          HDF5_ENABLE_USING_MEMCHECKER  ###
+###           T H E   T E S T S                                            ###
 ##############################################################################
 ##############################################################################
-   
+
   if (HDF5_ENABLE_USING_MEMCHECKER)
     # Remove any output file left over from previous test run
     add_test (
       NAME H5DUMP-XML-clearall-objects
       COMMAND    ${CMAKE_COMMAND}
-          -E remove 
+          -E remove
           tall.h5.out
           tall.h5.out.err
           tall-2A.h5.out
@@ -401,7 +401,7 @@
   ADD_XML_H5_TEST (tempty.h5 0 tempty.h5)
   ADD_XML_H5_TEST (tnamed_dtype_attr.h5 0 tnamed_dtype_attr.h5)
   ##Test dataset and attribute of null space.  Commented out:
-  ## wait until the XML schema is updated for null space. 
+  ## wait until the XML schema is updated for null space.
   ##  ADD_XML_H5_TEST (tnullspace.h5 0 tnulspace.h5)
   ## So is dataspace with 0 dimension size.
   ##  ADD_XML_H5_TEST (zerodim.h5 0 zerodim.h5)
@@ -414,7 +414,7 @@
   ADD_XML_H5_TEST (tempty-nons-2.h5 0 --xml-ns=: tempty.h5)
 
   ## Some of these combinations are syntactically correct but
-  ##  the URLs are dummies 
+  ##  the URLs are dummies
   ADD_XML_H5_TEST (tempty-ns.h5 0 -X thing: tempty.h5)
   ADD_XML_H5_TEST (tempty-ns-2.h5 0 --xml-ns=thing: tempty.h5)
   ADD_XML_H5_TEST (tempty-nons-uri.h5 0 --xml-ns=: --xml-dtd=http://somewhere.net tempty.h5)
@@ -431,4 +431,4 @@
 
   # tests for floating point user defined printf format
   ADD_XML_H5_TEST (tfpformat.h5 0 -u -m %.7f tfpformat.h5)
-   
+
diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt
index b885a76..7278bbe 100644
--- a/tools/h5import/CMakeLists.txt
+++ b/tools/h5import/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_H5IMPORT)
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
+INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
 
 # --------------------------------------------------------------------
 # Add the h5import executables
diff --git a/tools/h5jam/CMakeLists.txt b/tools/h5jam/CMakeLists.txt
index c01f8f7..0a9aa6c 100644
--- a/tools/h5jam/CMakeLists.txt
+++ b/tools/h5jam/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_H5JAM)
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
+INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
 
 # --------------------------------------------------------------------
 # Add the h5jam executables
diff --git a/tools/h5ls/CMakeLists.txt b/tools/h5ls/CMakeLists.txt
index 6e7f00c..b6c0141 100644
--- a/tools/h5ls/CMakeLists.txt
+++ b/tools/h5ls/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_H5LS)
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
+INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
 
 #-----------------------------------------------------------------------------
 # Add the h5ls executable
diff --git a/tools/h5ls/CMakeTests.cmake b/tools/h5ls/CMakeTests.cmake
index c5aff21..d704ffb 100644
--- a/tools/h5ls/CMakeTests.cmake
+++ b/tools/h5ls/CMakeTests.cmake
@@ -9,87 +9,87 @@
   # Copy all the test files from source directory to test directory
   # --------------------------------------------------------------------
   set (LIST_HDF5_TEST_FILES
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr2.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrreg.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdatareg.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlink.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinktar.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrp_comments.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcomp.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsaf.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tudlink.h5
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes1.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tall.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tattr2.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tdset.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tempty.h5
+      ${HDF5_TOOLS_DIR}/testfiles/textlink.h5
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5
+      ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.h5
+      ${HDF5_TOOLS_DIR}/testfiles/thlink.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tloop.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tslink.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tstr.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5
   )
 
   set (LIST_OTHER_TEST_FILES
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/help-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/help-2.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/help-3.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/nosuchfile.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-2.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr2.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrreg_le.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrreg_be.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcomp-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdataregbe.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdataregle.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlink-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-2.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-3.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-4.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-5.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-6.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-7.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-1-old.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-2-old.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-3-old.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-6-old.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-7-old.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-2.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-3.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-4.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-5.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-nodangle-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-nodangle-2.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrp_comments.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-nodangle-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/thlinks-nodangle-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-2.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-3.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tmultifile.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-2.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-3.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-4.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsaf.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tudlink-1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes1.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes2le.ls
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes2be.ls
+      ${HDF5_TOOLS_DIR}/testfiles/help-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/help-2.ls
+      ${HDF5_TOOLS_DIR}/testfiles/help-3.ls
+      ${HDF5_TOOLS_DIR}/testfiles/nosuchfile.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tall-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tall-2.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tarray1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tattr2.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tattrreg_le.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tattrreg_be.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tcomp-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tdataregbe.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tdataregle.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tdset-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tempty.ls
+      ${HDF5_TOOLS_DIR}/testfiles/textlink-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-2.ls
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-3.ls
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-4.ls
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-5.ls
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-6.ls
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-7.ls
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-1-old.ls
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-2-old.ls
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-3-old.ls
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-6-old.ls
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-7-old.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-2.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-3.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-4.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-5.ls
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-nodangle-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-nodangle-2.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-nodangle-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/thlinks-nodangle-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tgroup.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tgroup-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tgroup-2.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tgroup-3.ls
+      ${HDF5_TOOLS_DIR}/testfiles/thlink-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tloop-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tmultifile.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-2.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-3.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-4.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tsaf.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tslink-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tstr-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tudlink-1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2le.ls
+      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2be.ls
   )
 
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
@@ -107,7 +107,7 @@
     )
   endforeach (listfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
 
-  
+
 ##############################################################################
 ##############################################################################
 ###           T H E   T E S T S  M A C R O S                               ###
@@ -157,7 +157,7 @@
     add_test (
       NAME H5LS-clearall-objects
       COMMAND    ${CMAKE_COMMAND}
-          -E remove 
+          -E remove
           help-1.out
           help-1.out.err
           help-2.out
diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt
index d8542a4..dfe9271 100644
--- a/tools/h5repack/CMakeLists.txt
+++ b/tools/h5repack/CMakeLists.txt
@@ -4,13 +4,13 @@ PROJECT (HDF5_TOOLS_H5REPACK)
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
+INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
 INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR})
 
 # --------------------------------------------------------------------
 # Add h5Repack executables
 # --------------------------------------------------------------------
-set (REPACK_COMMON_SRCS
+set (REPACK_COMMON_SOURCES
     ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_copy.c
     ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_filters.c
     ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_opttable.c
@@ -20,7 +20,7 @@ set (REPACK_COMMON_SRCS
     ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack.c
 )
 
-add_executable (h5repack ${REPACK_COMMON_SRCS} ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_main.c)
+add_executable (h5repack ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_main.c)
 TARGET_NAMING (h5repack STATIC)
 TARGET_C_PROPERTIES (h5repack STATIC " " " ")
 target_link_libraries (h5repack  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
@@ -38,7 +38,7 @@ if (BUILD_TESTING)
   target_link_libraries (testh5repack_detect_szip ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
   set_target_properties (testh5repack_detect_szip PROPERTIES FOLDER tools)
 
-  add_executable (h5repacktest ${REPACK_COMMON_SRCS} ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repacktst.c)
+  add_executable (h5repacktest ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repacktst.c)
   TARGET_NAMING (h5repacktest STATIC)
   TARGET_C_PROPERTIES (h5repacktest STATIC " " " ")
   target_link_libraries (h5repacktest  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
diff --git a/tools/h5stat/CMakeLists.txt b/tools/h5stat/CMakeLists.txt
index 71c4741..f537ce6 100644
--- a/tools/h5stat/CMakeLists.txt
+++ b/tools/h5stat/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_H5STAT)
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
+INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
 
 # --------------------------------------------------------------------
 # Add the h5stat executables
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt
index ce1ad34..33c6b02 100644
--- a/tools/lib/CMakeLists.txt
+++ b/tools/lib/CMakeLists.txt
@@ -10,7 +10,7 @@ add_definitions (${HDF_EXTRA_C_FLAGS})
 # Define Sources
 #-----------------------------------------------------------------------------
 
-set (H5_TOOLS_LIB_SRCS
+set (H5_TOOLS_LIB_SOURCES
     ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff.c
     ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_array.c
     ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_attr.c
@@ -37,7 +37,7 @@ set (H5_TOOLS_LIB_HDRS
     ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff.h
 )
 
-add_library (${HDF5_TOOLS_LIB_TARGET} STATIC ${H5_TOOLS_LIB_SRCS} ${H5_TOOLS_LIB_HDRS})
+add_library (${HDF5_TOOLS_LIB_TARGET} STATIC ${H5_TOOLS_LIB_SOURCES} ${H5_TOOLS_LIB_HDRS})
 TARGET_C_PROPERTIES (${HDF5_TOOLS_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TOOLS_LIB_TARGET}")
@@ -50,7 +50,7 @@ set_target_properties (${HDF5_TOOLS_LIB_TARGET} PROPERTIES
 set (install_targets ${HDF5_TOOLS_LIB_TARGET})
 
 if (BUILD_SHARED_LIBS)
-  add_library (${HDF5_TOOLS_LIBSH_TARGET} SHARED ${H5_TOOLS_LIB_SRCS} ${H5_TOOLS_LIB_HDRS})
+  add_library (${HDF5_TOOLS_LIBSH_TARGET} SHARED ${H5_TOOLS_LIB_SOURCES} ${H5_TOOLS_LIB_HDRS})
   TARGET_C_PROPERTIES (${HDF5_TOOLS_LIBSH_TARGET} SHARED " " " ")
   target_link_libraries (${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TOOLS_LIBSH_TARGET}")
diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt
index 088dbdf..2e38fa3 100644
--- a/tools/misc/CMakeLists.txt
+++ b/tools/misc/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_MISC)
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
+INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
 
 # --------------------------------------------------------------------
 # Add the misc executables
diff --git a/tools/perform/CMakeLists.txt b/tools/perform/CMakeLists.txt
index 3a60a84..0a38b21 100644
--- a/tools/perform/CMakeLists.txt
+++ b/tools/perform/CMakeLists.txt
@@ -10,17 +10,17 @@ add_definitions (${HDF_EXTRA_C_FLAGS})
 # Setup include Directories
 #-----------------------------------------------------------------------------
 INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR})
-INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib )
+INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib )
 
 # --------------------------------------------------------------------
 # Add the executables
 # --------------------------------------------------------------------
 #-- Adding test for h5perf_serial
-set (h5perf_serial_SRCS
+set (h5perf_serial_SOURCES
     ${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_SOURCES})
 TARGET_NAMING (h5perf_serial STATIC)
 TARGET_C_PROPERTIES (h5perf_serial STATIC " " " ")
 target_link_libraries (h5perf_serial ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
@@ -28,11 +28,11 @@ set_target_properties (h5perf_serial PROPERTIES FOLDER perform)
 
 if (HDF5_BUILD_PERFORM_STANDALONE)
   #-- Adding test for h5perf_serial_alone
-  set (h5perf_serial_alone_SRCS
+  set (h5perf_serial_alone_SOURCES
       ${HDF5_PERFORM_SOURCE_DIR}/sio_perf.c
       ${HDF5_PERFORM_SOURCE_DIR}/sio_engine.c
   )
-  add_executable (h5perf_serial_alone ${h5perf_serial_alone_SRCS})
+  add_executable (h5perf_serial_alone ${h5perf_serial_alone_SOURCES})
   TARGET_NAMING (h5perf_serial_alone STATIC)
   TARGET_C_PROPERTIES (h5perf_serial_alone STATIC " " " ")
   target_link_libraries (h5perf_serial_alone ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
@@ -43,30 +43,30 @@ if (HDF5_BUILD_PERFORM_STANDALONE)
 endif (HDF5_BUILD_PERFORM_STANDALONE)
 
 #-- Adding test for chunk
-set (chunk_SRCS
+set (chunk_SOURCES
     ${HDF5_PERFORM_SOURCE_DIR}/chunk.c
 )
-ADD_EXECUTABLE(chunk ${chunk_SRCS})
+ADD_EXECUTABLE(chunk ${chunk_SOURCES})
 TARGET_NAMING (chunk STATIC)
 TARGET_C_PROPERTIES (chunk STATIC " " " ")
 TARGET_LINK_LIBRARIES(chunk ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 set_target_properties (chunk PROPERTIES FOLDER perform)
 
 #-- Adding test for iopipe
-set (iopipe_SRCS
+set (iopipe_SOURCES
     ${HDF5_PERFORM_SOURCE_DIR}/iopipe.c
 )
-add_executable (iopipe ${iopipe_SRCS})
+add_executable (iopipe ${iopipe_SOURCES})
 TARGET_NAMING (iopipe STATIC)
 TARGET_C_PROPERTIES (iopipe STATIC " " " ")
 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_SOURCES
     ${HDF5_PERFORM_SOURCE_DIR}/overhead.c
 )
-add_executable (overhead ${overhead_SRCS})
+add_executable (overhead ${overhead_SOURCES})
 TARGET_NAMING (overhead STATIC)
 TARGET_C_PROPERTIES (overhead STATIC " " " ")
 target_link_libraries (overhead ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
@@ -74,10 +74,10 @@ set_target_properties (overhead PROPERTIES FOLDER perform)
 
 if (BUILD_TESTING)
 #-- Adding test for perf_meta
-  set (perf_meta_SRCS
+  set (perf_meta_SOURCES
       ${HDF5_PERFORM_SOURCE_DIR}/perf_meta.c
   )
-  add_executable (perf_meta ${perf_meta_SRCS})
+  add_executable (perf_meta ${perf_meta_SOURCES})
   TARGET_NAMING (perf_meta STATIC)
   TARGET_C_PROPERTIES (perf_meta STATIC " " " ")
   target_link_libraries (perf_meta ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
@@ -85,10 +85,10 @@ if (BUILD_TESTING)
 endif (BUILD_TESTING)
 
 #-- Adding test for zip_perf
-set (zip_perf_SRCS
+set (zip_perf_SOURCES
     ${HDF5_PERFORM_SOURCE_DIR}/zip_perf.c
 )
-add_executable (zip_perf ${zip_perf_SRCS})
+add_executable (zip_perf ${zip_perf_SOURCES})
 TARGET_NAMING (zip_perf STATIC)
 TARGET_C_PROPERTIES (zip_perf STATIC " " " ")
 target_link_libraries (zip_perf ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
@@ -96,11 +96,11 @@ set_target_properties (zip_perf PROPERTIES FOLDER perform)
 
 if (H5_HAVE_PARALLEL AND BUILD_TESTING)
   #-- Adding test for h5perf
-  set (h5perf_SRCS
+  set (h5perf_SOURCES
       ${HDF5_PERFORM_SOURCE_DIR}/pio_perf.c
       ${HDF5_PERFORM_SOURCE_DIR}/pio_engine.c
   )
-  add_executable (h5perf ${h5perf_SRCS})
+  add_executable (h5perf ${h5perf_SOURCES})
   TARGET_NAMING (h5perf STATIC)
   TARGET_C_PROPERTIES (h5perf STATIC " " " ")
   target_link_libraries (h5perf ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
@@ -108,11 +108,11 @@ if (H5_HAVE_PARALLEL AND BUILD_TESTING)
 
   if (HDF5_BUILD_PERFORM_STANDALONE)
     #-- Adding test for h5perf
-    set (h5perf_alone_SRCS
+    set (h5perf_alone_SOURCES
         ${HDF5_PERFORM_SOURCE_DIR}/pio_perf.c
         ${HDF5_PERFORM_SOURCE_DIR}/pio_engine.c
     )
-    add_executable (h5perf_alone ${h5perf_alone_SRCS})
+    add_executable (h5perf_alone ${h5perf_alone_SOURCES})
     TARGET_NAMING (h5perf_alone STATIC)
     TARGET_C_PROPERTIES (h5perf_alone STATIC " " " ")
     target_link_libraries (h5perf_alone ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})