diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-05-14 19:53:47 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-05-14 19:53:47 (GMT) |
| commit | d55f3671dc959f223bff005ed6bef7d0a583fc51 (patch) | |
| tree | 2d5480bd21a87e5156e5288da75ae0669ba22834 | |
| parent | 6bbe9775c71d17834a71ed38c5f8beebcc882654 (diff) | |
| download | hdf5-d55f3671dc959f223bff005ed6bef7d0a583fc51.zip hdf5-d55f3671dc959f223bff005ed6bef7d0a583fc51.tar.gz hdf5-d55f3671dc959f223bff005ed6bef7d0a583fc51.tar.bz2 | |
[svn-r25190] Fix CMP0053 cmake usage and add VS2013
| -rw-r--r-- | CMakeInstallation.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 25ec43c..b9e7720 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 ( ${HDF5_RESOURCES_DIR}/hdf5-config.cmake.build.in @@ -161,6 +161,8 @@ if (WIN32) set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2008") elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "17.*") set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2012") + elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "18.*") + set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2013") else (${CMAKE_C_COMPILER_VERSION} MATCHES "16.*") set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ${CMAKE_C_COMPILER_VERSION}") endif (${CMAKE_C_COMPILER_VERSION} MATCHES "16.*") @@ -284,7 +286,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) set (CPACK_NSIS_MUI_UNIICON "${HDF5_RESOURCES_DIR}\\\\hdf.ico") # set the package header icon for MUI set (CPACK_PACKAGE_ICON "${HDF5_RESOURCES_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}") |