[svn-r24072] Merge trunk cmake changes to 1.8 branch.

Also add default switch blocks to h5import.
Merge h5dump any_path option from trunk.

Tested: local linux

1 files changed, 96 insertions, 62 deletions

diff --git a/MANIFEST b/MANIFEST
index 429be0b..574d9ac 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1238,10 +1238,14 @@
 ./tools/testfiles/family_file00017.h5
 ./tools/testfiles/filter_fail.h5
 ./tools/testfiles/filter_fail.ddl
-./tools/testfiles/packedbits.ddl
 ./tools/testfiles/h5dump-help.txt
+./tools/testfiles/packedbits.ddl
+./tools/testfiles/taindices.h5
 ./tools/testfiles/tall-1.ddl
 ./tools/testfiles/tall-2.ddl
+./tools/testfiles/tall-2A.ddl
+./tools/testfiles/tall-2A0.ddl
+./tools/testfiles/tall-2B.ddl
 ./tools/testfiles/tall-3.ddl
 ./tools/testfiles/tall-4s.ddl
 ./tools/testfiles/tall-5s.ddl
@@ -1250,6 +1254,7 @@
 ./tools/testfiles/tall-7.ddl
 ./tools/testfiles/tall-7N.ddl
 ./tools/testfiles/tall.h5
+./tools/testfiles/tallfilters.ddl
 ./tools/testfiles/tarray1.ddl
 ./tools/testfiles/tarray1.h5
 ./tools/testfiles/tarray1_big.ddl
@@ -1268,22 +1273,40 @@
 ./tools/testfiles/tarray7.h5
 ./tools/testfiles/tarray8.ddl
 ./tools/testfiles/tarray8.h5
+./tools/testfiles/tattr.h5
 ./tools/testfiles/tattr-1.ddl
 ./tools/testfiles/tattr-2.ddl
 ./tools/testfiles/tattr-3.ddl
 ./tools/testfiles/tattr-4_be.ddl
-./tools/testfiles/tattr.h5
+./tools/testfiles/tattr2.h5
+./tools/testfiles/tattr4_be.h5
+./tools/testfiles/tattrcontents1.ddl
+./tools/testfiles/tattrcontents2.ddl
 ./tools/testfiles/tattrintsize.ddl
 ./tools/testfiles/tattrintsize.h5
-./tools/testfiles/tattr4_be.h5
 ./tools/testfiles/tattrreg.h5
 ./tools/testfiles/tattrreg.ddl 
 ./tools/testfiles/tattrregR.ddl 
+./tools/testfiles/tbigdims.ddl
+./tools/testfiles/tbigdims.h5
+./tools/testfiles/tbinary.h5
+./tools/testfiles/tbin1.ddl
+./tools/testfiles/tbin2.ddl
+./tools/testfiles/tbin3.ddl
+./tools/testfiles/tbin4.ddl
 ./tools/testfiles/tbinregR.exp
 ./tools/testfiles/tbinregR.ddl
 ./tools/testfiles/tbitfields.h5
+./tools/testfiles/tboot1.ddl
+./tools/testfiles/tboot2.ddl
+./tools/testfiles/tboot2A.ddl
+./tools/testfiles/tboot2B.ddl
 ./tools/testfiles/tchar.h5
 ./tools/testfiles/tchar1.ddl
+./tools/testfiles/tchunked.ddl
+./tools/testfiles/tcompact.ddl
+./tools/testfiles/tcontents.ddl
+./tools/testfiles/tcontiguos.ddl
 ./tools/testfiles/tcmpdattrintsize.ddl
 ./tools/testfiles/tcmpdintsize.ddl
 ./tools/testfiles/tcmpdattrintsize.h5
@@ -1298,6 +1321,7 @@
 ./tools/testfiles/tdatareg.h5
 ./tools/testfiles/tdatareg.ddl 
 ./tools/testfiles/tdataregR.ddl 
+./tools/testfiles/tdeflate.ddl
 ./tools/testfiles/tdset-1.ddl
 ./tools/testfiles/tdset-2.ddl
 ./tools/testfiles/tdset-3s.ddl
@@ -1310,6 +1334,7 @@
 ./tools/testfiles/texceedsubcount.ddl
 ./tools/testfiles/texceedsubstart.ddl
 ./tools/testfiles/texceedsubstride.ddl
+./tools/testfiles/texternal.ddl
 ./tools/testfiles/textlink.h5
 ./tools/testfiles/textlink.h5.xml
 ./tools/testfiles/textlink.ddl
@@ -1318,7 +1343,6 @@
 ./tools/testfiles/textlinksrc.ddl
 ./tools/testfiles/textlinksrc.h5
 ./tools/testfiles/textlinktar.h5
-./tools/testfiles/tsoftlinks.h5
 ./tools/testfiles/tfamily.ddl
 ./tools/testfiles/tfamily00000.h5
 ./tools/testfiles/tfamily00001.h5
@@ -1331,6 +1355,12 @@
 ./tools/testfiles/tfamily00008.h5
 ./tools/testfiles/tfamily00009.h5
 ./tools/testfiles/tfamily00010.h5
+./tools/testfiles/tfcontents1.h5
+./tools/testfiles/tfcontents2.h5
+./tools/testfiles/tfill.ddl
+./tools/testfiles/tfilters.h5
+./tools/testfiles/tfletcher32.ddl
+./tools/testfiles/tfvalues.h5
 ./tools/testfiles/tgroup-1.ddl
 ./tools/testfiles/tgroup-2.ddl
 ./tools/testfiles/tgroup.h5
@@ -1343,8 +1373,17 @@
 ./tools/testfiles/thlink-4.ddl
 ./tools/testfiles/thlink-5.ddl
 ./tools/testfiles/thlink.h5
+./tools/testfiles/thyperslab.ddl
+./tools/testfiles/thyperslab.h5
+./tools/testfiles/tindicesyes.ddl
+./tools/testfiles/tindicesno.ddl
+./tools/testfiles/tindicessub2.ddl
+./tools/testfiles/tindicessub3.ddl
+./tools/testfiles/tindicessub4.ddl
+./tools/testfiles/tindicessub1.ddl
 ./tools/testfiles/tlarge_objname.ddl
 ./tools/testfiles/tlarge_objname.h5
+./tools/testfiles/tldouble.h5
 ./tools/testfiles/tlonglinks.ddl
 ./tools/testfiles/tlonglinks.h5
 ./tools/testfiles/tloop-1.ddl
@@ -1360,8 +1399,6 @@
 ./tools/testfiles/tmulti-s.h5
 ./tools/testfiles/tmultifile.ls
 ./tools/testfiles/tmultifile.ddl
-./tools/testfiles/tqmarkfile.ddl
-./tools/testfiles/tstarfile.ddl
 ./tools/testfiles/tnbit.ddl
 ./tools/testfiles/tnestcomp-1.ddl
 ./tools/testfiles/tnestedcomp.h5
@@ -1379,10 +1416,17 @@
 ./tools/testfiles/tnullspace.ddl
 ./tools/testfiles/tobjref.h5
 ./tools/testfiles/topaque.h5
+./tools/testfiles/tordercontents1.ddl
+./tools/testfiles/tordercontents2.ddl
+./tools/testfiles/torderlinks1.ddl
+./tools/testfiles/torderlinks2.ddl
+./tools/testfiles/tperror.ddl
+./tools/testfiles/tqmarkfile.ddl
 ./tools/testfiles/trawdatafile.ddl
 ./tools/testfiles/trawdatafile.exp
 ./tools/testfiles/trawssetfile.ddl
 ./tools/testfiles/trawssetfile.exp
+./tools/testfiles/treference.ddl
 ./tools/testfiles/tsaf.ddl
 ./tools/testfiles/tsaf.h5
 ./tools/testfiles/tscalarattrintsize.ddl
@@ -1392,19 +1436,32 @@
 ./tools/testfiles/tscalarstring.ddl
 ./tools/testfiles/tscalarstring.h5
 ./tools/testfiles/tscaleoffset.ddl
+./tools/testfiles/tshuffle.ddl
 ./tools/testfiles/tslink-1.ddl
 ./tools/testfiles/tslink-2.ddl
 ./tools/testfiles/tslink-D.ddl
 ./tools/testfiles/tslink.h5
+./tools/testfiles/tsoftlinks.h5
 ./tools/testfiles/tsplit_file-m.h5
 ./tools/testfiles/tsplit_file-r.h5
 ./tools/testfiles/tsplit_file.ddl
-./tools/testfiles/tstr-1.ddl
+./tools/testfiles/tstarfile.ddl
 ./tools/testfiles/tstr.h5
 ./tools/testfiles/tstr2.h5
+./tools/testfiles/tstr3.h5
+./tools/testfiles/tstr-1.ddl
 ./tools/testfiles/tstr-2.ddl
 ./tools/testfiles/tstr2bin2.exp
 ./tools/testfiles/tstr2bin6.exp
+./tools/testfiles/tstring.ddl
+./tools/testfiles/tstring2.ddl
+./tools/testfiles/tstringe.ddl
+./tools/testfiles/tszip.ddl
+./tools/testfiles/tudlink.h5
+./tools/testfiles/tudlink.h5.xml
+./tools/testfiles/tudlink-1.ddl
+./tools/testfiles/tudlink-2.ddl
+./tools/testfiles/tuserfilter.ddl
 ./tools/testfiles/tvldtypes1.ddl
 ./tools/testfiles/tvldtypes1.h5
 ./tools/testfiles/tvldtypes2.ddl
@@ -1417,63 +1474,8 @@
 ./tools/testfiles/tvldtypes5.h5
 ./tools/testfiles/tvlstr.h5
 ./tools/testfiles/tvlstr.ddl
-./tools/testfiles/tudlink.h5
-./tools/testfiles/tudlink.h5.xml
-./tools/testfiles/tudlink-1.ddl
-./tools/testfiles/tudlink-2.ddl
-./tools/testfiles/tattr2.h5
-./tools/testfiles/tall-2A.ddl
-./tools/testfiles/tall-2A0.ddl
-./tools/testfiles/tall-2B.ddl
-./tools/testfiles/tattrcontents1.ddl
-./tools/testfiles/tattrcontents2.ddl
-./tools/testfiles/tcontents.ddl
-./tools/testfiles/tordercontents1.ddl
-./tools/testfiles/tordercontents2.ddl
-./tools/testfiles/torderlinks1.ddl
-./tools/testfiles/torderlinks2.ddl
-./tools/testfiles/tfilters.h5
-./tools/testfiles/tchunked.ddl
-./tools/testfiles/tcompact.ddl
-./tools/testfiles/tcontiguos.ddl
-./tools/testfiles/tdeflate.ddl
-./tools/testfiles/texternal.ddl
-./tools/testfiles/tfletcher32.ddl
-./tools/testfiles/treference.ddl
-./tools/testfiles/tshuffle.ddl
-./tools/testfiles/tstring.ddl
-./tools/testfiles/tszip.ddl
-./tools/testfiles/tuserfilter.ddl
-./tools/testfiles/tallfilters.ddl
-./tools/testfiles/tstringe.ddl
-./tools/testfiles/tindicesyes.ddl
-./tools/testfiles/tindicesno.ddl
-./tools/testfiles/tfcontents1.h5
-./tools/testfiles/tfcontents2.h5
-./tools/testfiles/tboot1.ddl
-./tools/testfiles/tboot2.ddl
-./tools/testfiles/tperror.ddl
-./tools/testfiles/tfill.ddl
-./tools/testfiles/tfvalues.h5
-./tools/testfiles/tstring2.ddl
-./tools/testfiles/tstr3.h5
-./tools/testfiles/taindices.h5
 ./tools/testfiles/tvms.ddl
-./tools/testfiles/tldouble.h5
 ./tools/testfiles/tvms.h5
-./tools/testfiles/tbinary.h5
-./tools/testfiles/tbin1.ddl
-./tools/testfiles/tbin2.ddl
-./tools/testfiles/tbin3.ddl
-./tools/testfiles/tbin4.ddl
-./tools/testfiles/tindicessub2.ddl
-./tools/testfiles/tindicessub3.ddl
-./tools/testfiles/tindicessub4.ddl
-./tools/testfiles/tindicessub1.ddl
-./tools/testfiles/thyperslab.ddl
-./tools/testfiles/tbigdims.ddl
-./tools/testfiles/tbigdims.h5
-./tools/testfiles/thyperslab.h5
 ./tools/testfiles/twidedisplay.ddl
 ./tools/testfiles/twithddl.exp
 ./tools/testfiles/twithddlfile.ddl
@@ -1573,6 +1575,7 @@
 ./tools/testfiles/tpbitsIntOffsetExceeded.ddl
 ./tools/testfiles/tpbitsLongOffsetExceeded.ddl
 ./tools/testfiles/tpbitsOverlapped.ddl
+
 # h5dump h5import validation
 ./tools/testfiles/out3.h5import
 ./tools/testfiles/tordergr.h5
@@ -1588,6 +1591,7 @@
 ./tools/testfiles/torderattr.h5
 ./tools/testfiles/tfpformat.ddl
 ./tools/testfiles/tfpformat.h5
+
 # h5dump h5repack validation
 ./tools/testfiles/h5repack_filters.h5.ddl
 ./tools/testfiles/zerodim.ddl
@@ -1964,6 +1968,7 @@
 ./tools/h5repack/testfiles/h5repack_attr.h5
 ./tools/h5repack/testfiles/h5repack_hlink.h5
 ./tools/h5repack/testfiles/h5repack_layout.h5
+./tools/h5repack/testfiles/h5repack_layout.h5.ddl
 ./tools/h5repack/testfiles/h5repack_layouto.h5
 ./tools/h5repack/testfiles/h5repack_layout2.h5
 ./tools/h5repack/testfiles/h5repack_layout3.h5
@@ -2277,45 +2282,74 @@
 ./release_docs/USING_CMake_Examples.txt
 
 ./CMakeLists.txt
+./CMakeFilters.cmake
+./CMakeInstallation.cmake
 ./CTestConfig.cmake
 ./UserMacros.cmake
 ./c++/CMakeLists.txt
 ./c++/examples/CMakeLists.txt
+./c++/examples/CMakeTests.cmake
 ./c++/src/CMakeLists.txt
 ./c++/test/CMakeLists.txt
+./c++/test/CMakeTests.cmake
 ./examples/CMakeLists.txt
+./examples/CMakeTests.cmake
 ./examples/run-all-ex.sh
 ./examples/run-c-ex.sh.in
 ./fortran/CMakeLists.txt
 ./fortran/examples/CMakeLists.txt
+./fortran/examples/CMakeTests.cmake
 ./fortran/src/CMakeLists.txt
 ./fortran/test/CMakeLists.txt
+./fortran/test/CMakeTests.cmake
 ./fortran/testpar/CMakeLists.txt
+./fortran/testpar/CMakeTests.cmake
 ./hl/CMakeLists.txt
 ./hl/c++/CMakeLists.txt
 ./hl/c++/examples/CMakeLists.txt
+./hl/c++/examples/CMakeTests.cmake
 ./hl/c++/src/CMakeLists.txt
 ./hl/c++/test/CMakeLists.txt
+./hl/c++/test/CMakeTests.cmake
 ./hl/examples/CMakeLists.txt
+./hl/examples/CMakeTests.cmake
 ./hl/fortran/CMakeLists.txt
 ./hl/fortran/examples/CMakeLists.txt
+./hl/fortran/examples/CMakeTests.cmake
 ./hl/fortran/src/CMakeLists.txt
 ./hl/fortran/test/CMakeLists.txt
+./hl/fortran/test/CMakeTests.cmake
 ./hl/src/CMakeLists.txt
 ./hl/test/CMakeLists.txt
+./hl/test/CMakeTests.cmake
 ./hl/tools/CMakeLists.txt
+./hl/tools/CMakeTests.cmake
 ./perform/CMakeLists.txt
+./perform/CMakeTests.cmake
 ./src/CMakeLists.txt
 ./test/CMakeLists.txt
+./test/CMakeTests.cmake
 ./testpar/CMakeLists.txt
+./testpar/CMakeTests.cmake
 ./tools/CMakeLists.txt
 ./tools/h5copy/CMakeLists.txt
+./tools/h5copy/CMakeTests.cmake
 ./tools/h5diff/CMakeLists.txt
+./tools/h5diff/CMakeTests.cmake
 ./tools/h5dump/CMakeLists.txt
+./tools/h5dump/CMakeTests.cmake
+./tools/h5dump/CMakeTestsPBITS.cmake
+./tools/h5dump/CMakeTestsXML.cmake
 ./tools/h5import/CMakeLists.txt
+./tools/h5import/CMakeTests.cmake
 ./tools/h5jam/CMakeLists.txt
+./tools/h5jam/CMakeTests.cmake
 ./tools/h5ls/CMakeLists.txt
+./tools/h5ls/CMakeTests.cmake
 ./tools/h5repack/CMakeLists.txt
+./tools/h5repack/CMakeTests.cmake
 ./tools/h5stat/CMakeLists.txt
+./tools/h5stat/CMakeTests.cmake
 ./tools/lib/CMakeLists.txt
 ./tools/misc/CMakeLists.txt
+./tools/misc/CMakeTests.cmake