[svn-r19330] Description:

	Bring r19109:19328 from trunk to revise_chunks branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.4 (amazon) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode

1 files changed, 57 insertions, 57 deletions

diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index fee9a6a..4c6dd5f 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -19,66 +19,66 @@ CONFIGURE_FILE (${HDF5_RESOURCES_DIR}/H5cxx_config.h.in
 # Define cpp Library
 #-----------------------------------------------------------------------------
 SET (CPP_SRCS
-    ${HDF5_CPP_SOURCE_DIR}/src/H5AbstractDs.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5ArrayType.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5AtomType.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5Attribute.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5CommonFG.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5CompType.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5DataSet.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5DataSpace.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5DataType.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5DcreatProp.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5DxferProp.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5EnumType.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5Exception.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5FaccProp.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5FcreatProp.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5File.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5FloatType.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5Group.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5IdComponent.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5IntType.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5Library.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5Object.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5PredType.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5PropList.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5StrType.cpp
-    ${HDF5_CPP_SOURCE_DIR}/src/H5VarLenType.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5AbstractDs.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5ArrayType.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5AtomType.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5Attribute.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5CommonFG.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5CompType.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataSet.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataSpace.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataType.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5DcreatProp.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5DxferProp.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5EnumType.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5Exception.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5FaccProp.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5FcreatProp.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5File.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5FloatType.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5Group.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5IdComponent.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5IntType.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5Library.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5Object.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5PredType.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5PropList.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5StrType.cpp
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5VarLenType.cpp
 )
 
 SET (CPP_HDRS
-    ${HDF5_CPP_SOURCE_DIR}/src/H5AbstractDs.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5Alltypes.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5ArrayType.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5AtomType.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5Attribute.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5Classes.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5CommonFG.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5CompType.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5Cpp.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5CppDoc.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5DataSet.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5DataSpace.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5DataType.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5DcreatProp.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5DxferProp.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5EnumType.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5Exception.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5FaccProp.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5FcreatProp.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5File.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5FloatType.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5Group.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5IdComponent.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5Include.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5IntType.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5Library.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5Object.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5PredType.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5PropList.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5StrType.h
-    ${HDF5_CPP_SOURCE_DIR}/src/H5VarLenType.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5AbstractDs.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5Alltypes.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5ArrayType.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5AtomType.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5Attribute.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5Classes.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5CommonFG.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5CompType.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5Cpp.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5CppDoc.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataSet.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataSpace.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataType.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5DcreatProp.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5DxferProp.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5EnumType.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5Exception.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5FaccProp.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5FcreatProp.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5File.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5FloatType.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5Group.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5IdComponent.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5Include.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5IntType.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5Library.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5Object.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5PredType.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5PropList.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5StrType.h
+    ${HDF5_CPP_SRC_SOURCE_DIR}/H5VarLenType.h
 )
 
 ADD_LIBRARY (${HDF5_CPP_LIB_TARGET} ${LIB_TYPE} ${CPP_SRCS} ${CPP_HDRS})