diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-05-14 19:51:54 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-05-14 19:51:54 (GMT) |
| commit | ef494f08a2db6f11846c479c34010792a3d66d9c (patch) | |
| tree | 8913f072341dc587454b631ecd760a9205241a3c | |
| parent | 21474f8eeef355d6f21403c14b7de5b54b4da064 (diff) | |
| download | hdf5-ef494f08a2db6f11846c479c34010792a3d66d9c.zip hdf5-ef494f08a2db6f11846c479c34010792a3d66d9c.tar.gz hdf5-ef494f08a2db6f11846c479c34010792a3d66d9c.tar.bz2 | |
[svn-r25189] Fix CMP0053 cmake usage
| -rw-r--r-- | CMakeInstallation.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 0389a0b..b66e4f5 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -39,9 +39,9 @@ set (HDF5_INCLUDES_BUILD_TIME ${HDF5_SRC_DIR} ${HDF5_CPP_SRC_DIR} ${HDF5_HL_SRC_DIR} ${HDF5_TOOLS_SRC_DIR} ${HDF5_BINARY_DIR} ) -set (HDF5_VERSION_STRING @HDF5_PACKAGE_VERSION@) -set (HDF5_VERSION_MAJOR @HDF5_PACKAGE_VERSION_MAJOR@) -set (HDF5_VERSION_MINOR @HDF5_PACKAGE_VERSION_MINOR@) +set (HDF5_VERSION_STRING ${HDF5_PACKAGE_VERSION}) +set (HDF5_VERSION_MAJOR ${HDF5_PACKAGE_VERSION_MAJOR}) +set (HDF5_VERSION_MINOR ${HDF5_PACKAGE_VERSION_MINOR}) configure_file ( ${HDF_RESOURCES_DIR}/hdf5-config.cmake.build.in @@ -272,7 +272,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) set (CPACK_NSIS_MUI_UNIICON "${HDF_RESOURCES_EXT_DIR}\\\\hdf.ico") # set the package header icon for MUI set (CPACK_PACKAGE_ICON "${HDF_RESOURCES_EXT_DIR}\\\\hdf.bmp") - set (CPACK_NSIS_DISPLAY_NAME "@CPACK_NSIS_PACKAGE_NAME@") + set (CPACK_NSIS_DISPLAY_NAME "${CPACK_NSIS_PACKAGE_NAME}") set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}\\\\${CPACK_PACKAGE_NAME}\\\\${CPACK_PACKAGE_VERSION}") set (CPACK_MONOLITHIC_INSTALL ON) set (CPACK_NSIS_CONTACT "${HDF5_PACKAGE_BUGREPORT}") |