diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-05-17 17:39:03 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-05-17 17:39:03 (GMT) |
| commit | 8cd51f64a54551bc99bad14593a6a00e31a7e3ac (patch) | |
| tree | c6daf9526a66522bc26a6a2e2b12d33c4c4601d3 /CMakeLists.txt | |
| parent | 2134f3ab6ff428a821739417960116e788679850 (diff) | |
| download | hdf5-8cd51f64a54551bc99bad14593a6a00e31a7e3ac.zip hdf5-8cd51f64a54551bc99bad14593a6a00e31a7e3ac.tar.gz hdf5-8cd51f64a54551bc99bad14593a6a00e31a7e3ac.tar.bz2 | |
[svn-r20849] Change CPack commands for extlibs to test for EXTERNAL_PROJ define instead of CMakeCache.txt file.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e0934b7..5f63386 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -949,15 +949,18 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED) INCLUDE (CPack) - IF (EXISTS "${SZIP_INCLUDE_DIR_GEN}/CMakeCache.txt") - SET (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;headers;/") - SET (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;libraries;/") - ENDIF (EXISTS "${SZIP_INCLUDE_DIR_GEN}/CMakeCache.txt") - - IF (EXISTS "${ZLIB_INCLUDE_DIR_GEN}/CMakeCache.txt") - SET (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};ZLIB;headers;/") - SET (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};ZLIB;libraries;/") - ENDIF (EXISTS "${ZLIB_INCLUDE_DIR_GEN}/CMakeCache.txt") + IF (HDF5_PACKAGE_EXTLIBS) + IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") + IF (ZLIB_FOUND AND ZLIB_USE_EXTERNAL) + SET (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};ZLIB;headers;/") + SET (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};ZLIB;libraries;/") + ENDIF (ZLIB_FOUND AND ZLIB_USE_EXTERNAL) + IF (SZIP_FOUND AND SZIP_USE_EXTERNAL) + SET (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;headers;/") + SET (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;libraries;/") + ENDIF (SZIP_FOUND AND SZIP_USE_EXTERNAL) + ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") + ENDIF (HDF5_PACKAGE_EXTLIBS) #--------------------------------------------------------------------------- # Now list the cpack commands |