[svn-r23510] I merged the changes for DESY project from the trunk (r23496) into this 1.8 DESY branch.

Tested with h5committest (duck failed with CMake because I don't know how to change test/CMakeLists.txt.  I'll wait for Allen to do it).

1 files changed, 46 insertions, 0 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f6228f2..0cf6418 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -352,6 +352,42 @@ SET (H5P_HDRS
 )
 IDE_GENERATED_PROPERTIES ("H5P" "${H5P_HDRS}" "${H5P_SRCS}" )
 
+SET (H5PL_SRCS
+    ${HDF5_SRC_DIR}/H5PL.c
+)
+
+SET (H5PL_HDRS
+    ${HDF5_SRC_DIR}/H5PLpublic.h
+)
+IDE_GENERATED_PROPERTIES ("H5PL" "${H5PL_HDRS}" "${H5PL_SRCS}" )
+
+
+SET (H5R_SRCS
+    ${HDF5_SRC_DIR}/H5R.c
+    ${HDF5_SRC_DIR}/H5Rdeprec.c
+)
+SET (H5R_HDRS
+    ${HDF5_SRC_DIR}/H5Rpkg.h
+    ${HDF5_SRC_DIR}/H5Rpublic.h
+)
+IDE_GENERATED_PROPERTIES ("H5R" "${H5R_HDRS}" "${H5R_SRCS}" )
+
+
+SET (H5RC_SRCS
+    ${HDF5_SRC_DIR}/H5RC.c
+)
+SET (H5RC_HDRS
+)
+IDE_GENERATED_PROPERTIES ("H5RC" "${H5RC_HDRS}" "${H5RC_SRCS}" )
+
+
+SET (H5RS_SRCS
+    ${HDF5_SRC_DIR}/H5RS.c
+)
+SET (H5RS_HDRS
+)
+IDE_GENERATED_PROPERTIES ("H5RS" "${H5RS_HDRS}" "${H5RS_SRCS}" )
+
 SET (H5S_SRCS
     ${HDF5_SRC_DIR}/H5S.c
     ${HDF5_SRC_DIR}/H5Sall.c
@@ -455,6 +491,10 @@ SET (common_SRCS
     ${H5MP_SRCS}
     ${H5O_SRCS}
     ${H5P_SRCS}
+    ${H5PL_SRCS}
+    ${H5R_SRCS}
+    ${H5RC_SRCS}
+    ${H5RS_SRCS}
     ${H5S_SRCS}
     ${H5SM_SRCS}
     ${H5T_SRCS}
@@ -498,6 +538,8 @@ SET (H5_PUBLIC_HEADERS
     ${H5MP_HDRS}
     ${H5O_HDRS}
     ${H5P_HDRS}
+    ${H5PL_HDRS}
+    ${H5R_HDRS}
     ${H5S_HDRS}
     ${H5SM_HDRS}
     ${H5T_HDRS}
@@ -548,6 +590,7 @@ SET (H5_PRIVATE_HEADERS
     ${HDF5_SRC_DIR}/H5MPprivate.h
     ${HDF5_SRC_DIR}/H5Oprivate.h
     ${HDF5_SRC_DIR}/H5Pprivate.h
+    ${HDF5_SRC_DIR}/H5PLprivate.h
     ${HDF5_SRC_DIR}/H5RCprivate.h
     ${HDF5_SRC_DIR}/H5Rprivate.h
     ${HDF5_SRC_DIR}/H5RSprivate.h
@@ -634,6 +677,9 @@ SET_SOURCE_FILES_PROPERTIES (${HDF5_BINARY_DIR}/H5overflow.h GENERATED)
 
 ADD_LIBRARY (${HDF5_LIB_TARGET} ${LIB_TYPE} ${common_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS})
 TARGET_LINK_LIBRARIES (${HDF5_LIB_TARGET} ${LINK_LIBS})
+IF (NOT WIN32)
+  TARGET_LINK_LIBRARIES (${HDF5_LIB_TARGET} dl)
+ENDIF (NOT WIN32)
 SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT ${HDF5_LIB_TARGET})
 H5_SET_LIB_OPTIONS (${HDF5_LIB_TARGET} ${HDF5_LIB_NAME} ${LIB_TYPE})
 SET_TARGET_PROPERTIES (${HDF5_LIB_TARGET} PROPERTIES FOLDER libraries)