[svn-r22522] Merge trunk revision 22520 cmake files and h5dump/h5diff and configure to branch

This commit is contained in:
Allen Byrne
2012-07-06 14:16:07 -05:00
parent 3fef275c89
commit 046f1d7b1f
75 changed files with 4495 additions and 1214 deletions

View File

@@ -43,8 +43,8 @@ IF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)
ENDIF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)
IF (HDF5_BUILD_TOOLS)
SET (HDF5_INCLUDE_DIR_TOOLS "${_IMPORT_PREFIX}/include/tools" )
SET (HDF5_TOOLS_DIR "${_IMPORT_PREFIX}/bin/tools" )
SET (HDF5_INCLUDE_DIR_TOOLS "${_IMPORT_PREFIX}/include" )
SET (HDF5_TOOLS_DIR "${_IMPORT_PREFIX}/bin" )
ENDIF (HDF5_BUILD_TOOLS)
#-----------------------------------------------------------------------------