From 4cae0acb175e6b4348c68d5ffa4b0490440c5425 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Wed, 31 Aug 2011 11:04:32 -0500 Subject: [svn-r21340] Add check for target already exists --- config/cmake/hdf5-config.cmake.install.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/cmake/hdf5-config.cmake.install.in b/config/cmake/hdf5-config.cmake.install.in index 22ce5f3..610841c 100644 --- a/config/cmake/hdf5-config.cmake.install.in +++ b/config/cmake/hdf5-config.cmake.install.in @@ -59,12 +59,12 @@ SET (HDF5_VERSION_MINOR @HDF5_VERSION_MINOR@) # project which has already built hdf5 as a subproject #----------------------------------------------------------------------------- IF (NOT TARGET "hdf5") - IF (HDF5_ENABLE_Z_LIB_SUPPORT AND HDF5_PACKAGE_EXTLIBS) + IF (HDF5_ENABLE_Z_LIB_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "zlib") INCLUDE (${SELF_DIR}/../ZLIB/ZLIB-targets.cmake) - ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT AND HDF5_PACKAGE_EXTLIBS) - IF (HDF5_ENABLE_SZIP_SUPPORT AND HDF5_PACKAGE_EXTLIBS) + ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "zlib") + IF (HDF5_ENABLE_SZIP_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "szip") INCLUDE (${SELF_DIR}/../SZIP/SZIP-targets.cmake) - ENDIF (HDF5_ENABLE_SZIP_SUPPORT AND HDF5_PACKAGE_EXTLIBS) + ENDIF (HDF5_ENABLE_SZIP_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "szip") INCLUDE (${SELF_DIR}/hdf5-targets.cmake) SET (HDF5_LIBRARIES "@HDF5_LIBRARIES_TO_EXPORT@") ENDIF (NOT TARGET "hdf5") -- cgit v0.12