[svn-r19875] Correct HDF5 configuration variables for CPack/Install.

Tested: windows

4 files changed, 16 insertions, 10 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3aa00c..9cdfef5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,9 +133,9 @@ SET (HDF5_PERFORM_SRC_DIR    ${HDF5_SOURCE_DIR}/perform)
 SET (HDF5_F90_SRC_DIR        ${HDF5_SOURCE_DIR}/fortran)
 
 # set default prefix location
-IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  SET(CMAKE_INSTALL_PREFIX "hdf5" CACHE PATH "Install path prefix, prepended onto install directories" FORCE)
-ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+#IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+#  SET(CMAKE_INSTALL_PREFIX "hdf5" CACHE PATH "Install path prefix, prepended onto install directories" FORCE)
+#ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 
 IF (NOT HDF5_INSTALL_BIN_DIR)
   SET (HDF5_INSTALL_BIN_DIR bin)
@@ -1044,6 +1044,7 @@ ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED)
 IF (NOT HDF5_EXTERNALLY_CONFIGURED)
   SET (CPACK_PACKAGE_VENDOR "The HDF Group")
   SET (CPACK_PACKAGE_NAME "${HDF5_PACKAGE_NAME}")
+  SET (CPACK_PACKAGE_INSTALL_DIRECTORY "${HDF5_PACKAGE_NAME}")
   SET (CPACK_PACKAGE_VERSION "${HDF5_PACKAGE_VERSION}")
   SET (CPACK_PACKAGE_VERSION_MAJOR "${HDF5_PACKAGE_VERSION_MAJOR}")
   SET (CPACK_PACKAGE_VERSION_MINOR "${HDF5_PACKAGE_VERSION_MINOR}")
@@ -1053,6 +1054,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED)
   ENDIF (EXISTS "${HDF5_SOURCE_DIR}/release_docs")
   
   IF (WIN32)
+    SET (CPACK_NSIS_MODIFY_PATH ON)
     SET (CPACK_NSIS_PACKAGE_NAME "HDF5 ${HDF5_PACKAGE_VERSION}")
   ENDIF (WIN32)
   
diff --git a/config/cmake/FindHDF5.cmake b/config/cmake/FindHDF5.cmake
index 3c3f6d6..03820e9 100644
--- a/config/cmake/FindHDF5.cmake
+++ b/config/cmake/FindHDF5.cmake
@@ -63,7 +63,8 @@ FIND_PATH (HDF5_ROOT_DIR "hdf5-config.cmake"
     HINTS ${_HDF5_HINTS}

     PATHS ${_HDF5_PATHS}

     PATH_SUFFIXES

-        lib/cmake/hdf5-1.8.6

+        lib/cmake/hdf5-1.8.7

+        share/cmake/hdf5-1.8.7

 )

 

 FIND_PATH (HDF5_INCLUDE_DIRS "H5public.h"

diff --git a/config/cmake/hdf5-config.cmake.build.in b/config/cmake/hdf5-config.cmake.build.in
index 293ec69..47a119a 100644
--- a/config/cmake/hdf5-config.cmake.build.in
+++ b/config/cmake/hdf5-config.cmake.build.in
@@ -7,7 +7,6 @@ GET_FILENAME_COMPONENT (SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 # User Options

 #-----------------------------------------------------------------------------

 SET (HDF5_ENABLE_PARALLEL @HDF5_ENABLE_PARALLEL@)

-SET (BUILD_SHARED_LIBS    @BUILD_SHARED_LIBS@)

 SET (HDF5_BUILD_FORTRAN   @HDF5_BUILD_FORTRAN@)

 SET (HDF5_BUILD_CPP_LIB   @HDF5_BUILD_CPP_LIB@)

 SET (HDF5_BUILD_TOOLS     @HDF5_BUILD_TOOLS@)

@@ -15,6 +14,7 @@ SET (HDF5_BUILD_HL_LIB    @HDF5_BUILD_HL_LIB@)
 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@)

 

 #-----------------------------------------------------------------------------

 # Directories

diff --git a/config/cmake/hdf5-config.cmake.install.in b/config/cmake/hdf5-config.cmake.install.in
index 8a1bffb..dadbeb6 100644
--- a/config/cmake/hdf5-config.cmake.install.in
+++ b/config/cmake/hdf5-config.cmake.install.in
@@ -11,7 +11,10 @@ SET (HDF5_BUILD_FORTRAN   @HDF5_BUILD_FORTRAN@)
 SET (HDF5_BUILD_CPP_LIB   @HDF5_BUILD_CPP_LIB@)

 SET (HDF5_BUILD_TOOLS     @HDF5_BUILD_TOOLS@)

 SET (HDF5_BUILD_HL_LIB    @HDF5_BUILD_HL_LIB@)

-SET (HDF5_BUILD_HL_CPP_LIB    @HDF5_BUILD_HL_CPP_LIB@)

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

 

 #-----------------------------------------------------------------------------

 # Directories

@@ -26,14 +29,14 @@ IF (HDF5_BUILD_CPP_LIB)
   SET (HDF5_INCLUDE_DIR_CPP "@CMAKE_INSTALL_PREFIX@/include/cpp" )

 ENDIF (HDF5_BUILD_CPP_LIB)

 

-IF (HDF5_BUILD_HL_CPP_LIB)

-  SET (HDF5_INCLUDE_DIR_HL_CPP "@CMAKE_INSTALL_PREFIX@/include/hl/cpp" )

-ENDIF (HDF5_BUILD_HL_CPP_LIB)

-

 IF (HDF5_BUILD_HL_LIB)

   SET (HDF5_INCLUDE_DIR_HL "@CMAKE_INSTALL_PREFIX@/include/hl" )

 ENDIF (HDF5_BUILD_HL_LIB)

 

+IF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)

+  SET (HDF5_INCLUDE_DIR_HL_CPP "@CMAKE_INSTALL_PREFIX@/include/hl/cpp" )

+ENDIF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)

+

 IF (HDF5_BUILD_TOOLS)

   SET (HDF5_INCLUDE_DIR_TOOLS "@CMAKE_INSTALL_PREFIX@/include/tools" )

 ENDIF (HDF5_BUILD_TOOLS)