diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-08-31 16:04:48 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-08-31 16:04:48 (GMT) |
| commit | 3852fe2e1047d0c42ed626c296746f1be9f76283 (patch) | |
| tree | 4e1b8e26df950fc1f3b4913cf48145539abf2969 | |
| parent | 26f47610b1900111fe0919c3bcaa835639dfe462 (diff) | |
| download | hdf5-3852fe2e1047d0c42ed626c296746f1be9f76283.zip hdf5-3852fe2e1047d0c42ed626c296746f1be9f76283.tar.gz hdf5-3852fe2e1047d0c42ed626c296746f1be9f76283.tar.bz2 | |
[svn-r21341] Add check for target already exists
| -rw-r--r-- | config/cmake/hdf5-config.cmake.install.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/cmake/hdf5-config.cmake.install.in b/config/cmake/hdf5-config.cmake.install.in index 6ff1334..7414eac 100644 --- a/config/cmake/hdf5-config.cmake.install.in +++ b/config/cmake/hdf5-config.cmake.install.in @@ -58,12 +58,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")
|