[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.

2 files changed, 81 insertions, 81 deletions

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