diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2011-05-18 18:23:41 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2011-05-18 18:23:41 (GMT) |
commit | 54728019ca2a5be26efcc56fd361cbcc11f5b36a (patch) | |
tree | 3c1d3ebd630d855c8c691e2413b85ddd3d2dfbfe | |
parent | 5d7907cde59e2e0e00e2ea8075d1c82a5f9f8b4b (diff) | |
download | hdf5-54728019ca2a5be26efcc56fd361cbcc11f5b36a.zip hdf5-54728019ca2a5be26efcc56fd361cbcc11f5b36a.tar.gz hdf5-54728019ca2a5be26efcc56fd361cbcc11f5b36a.tar.bz2 |
[svn-r20863] Adjust CPack configuration location by removing version extension in folder name. Add install configuration commands if ext libs are packaged with project.
-rw-r--r-- | CMakeLists.txt | 6 | ||||
-rw-r--r-- | config/cmake/FindHDF5.cmake | 4 | ||||
-rw-r--r-- | config/cmake/hdf5-config.cmake.install.in | 7 | ||||
-rw-r--r-- | test/CMakeLists.txt | 1 |
4 files changed, 12 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7022f5a..9253757 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -732,7 +732,7 @@ ENDIF (NOT HDF5_INSTALL_NO_DEVELOPMENT) IF (NOT HDF5_EXTERNALLY_CONFIGURED) INSTALL ( EXPORT ${HDF5_EXPORTED_TARGETS} - DESTINATION ${HDF5_INSTALL_DATA_DIR}/cmake/hdf5-${HDF5_PACKAGE_VERSION} + DESTINATION ${HDF5_INSTALL_DATA_DIR}/cmake/hdf5 FILE hdf5-targets.cmake ) ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED) @@ -773,7 +773,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED) ) INSTALL ( FILES ${HDF5_BINARY_DIR}/CMakeFiles/hdf5-config.cmake - DESTINATION ${HDF5_INSTALL_DATA_DIR}/cmake/hdf5-${HDF5_PACKAGE_VERSION} + DESTINATION ${HDF5_INSTALL_DATA_DIR}/cmake/hdf5 ) ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED) @@ -787,7 +787,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED) ) INSTALL ( FILES ${HDF5_BINARY_DIR}/CMakeFiles/hdf5-config-version.cmake - DESTINATION ${HDF5_INSTALL_DATA_DIR}/cmake/hdf5-${HDF5_PACKAGE_VERSION} + DESTINATION ${HDF5_INSTALL_DATA_DIR}/cmake/hdf5 ) ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED) diff --git a/config/cmake/FindHDF5.cmake b/config/cmake/FindHDF5.cmake index 03820e9..33532b0 100644 --- a/config/cmake/FindHDF5.cmake +++ b/config/cmake/FindHDF5.cmake @@ -63,8 +63,8 @@ FIND_PATH (HDF5_ROOT_DIR "hdf5-config.cmake" HINTS ${_HDF5_HINTS}
PATHS ${_HDF5_PATHS}
PATH_SUFFIXES
- lib/cmake/hdf5-1.8.7
- share/cmake/hdf5-1.8.7
+ lib/cmake/hdf5
+ share/cmake/hdf5
)
FIND_PATH (HDF5_INCLUDE_DIRS "H5public.h"
diff --git a/config/cmake/hdf5-config.cmake.install.in b/config/cmake/hdf5-config.cmake.install.in index eed1a2a..0e653ea 100644 --- a/config/cmake/hdf5-config.cmake.install.in +++ b/config/cmake/hdf5-config.cmake.install.in @@ -18,6 +18,7 @@ SET (HDF5_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@) SET (HDF5_ENABLE_SZIP_SUPPORT @HDF5_ENABLE_SZIP_SUPPORT@)
SET (HDF5_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)
SET (BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
+SET (HDF5_PACKAGE_EXTLIBS @HDF5_PACKAGE_EXTLIBS@)
#-----------------------------------------------------------------------------
# Directories
@@ -57,6 +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)
+ 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)
+ INCLUDE (${SELF_DIR}/../SZIP/SZIP-targets.cmake)
+ ENDIF (HDF5_ENABLE_SZIP_SUPPORT AND HDF5_PACKAGE_EXTLIBS)
INCLUDE (${SELF_DIR}/hdf5-targets.cmake)
ENDIF (NOT TARGET "hdf5")
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8cb55a6..2d80e30 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -103,7 +103,6 @@ SET (HDF5_REFERENCE_TEST_FILES tlayouto.h5 tmtimen.h5 tmtimeo.h5 - vms_data.h5 ) FOREACH (h5_file ${HDF5_REFERENCE_TEST_FILES}) |