diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-12-08 20:13:43 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-12-08 20:13:43 (GMT) |
| commit | 0d15ffa78a64be3ce10ef9025cbc8ae358ddbd49 (patch) | |
| tree | 43c468417433723149091c9d5c41cf53df9e55f6 /CMakeLists.txt | |
| parent | 7490e286e2278b28751a7d3b1789b2779aca216b (diff) | |
| download | hdf5-0d15ffa78a64be3ce10ef9025cbc8ae358ddbd49.zip hdf5-0d15ffa78a64be3ce10ef9025cbc8ae358ddbd49.tar.gz hdf5-0d15ffa78a64be3ce10ef9025cbc8ae358ddbd49.tar.bz2 | |
[svn-r19875] Correct HDF5 configuration variables for CPack/Install.
Tested: windows
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 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) |