philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r20862] Adjust CPack configuration location by removing version extension in folder name. Add install configuration commands if ext libs are packaged with project.

Browse Source
This commit is contained in:
Allen Byrne
2011-05-18 12:50:32 -05:00
parent 976eb5e523
commit 089e81e86a
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/cmake/hdf5-config.cmake.install.in
View File

@@ -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")