#1014 System : Use RESINSIGHT_MAJOR_VERSION and RESINSIGHT_MINOR_VERSION

This commit is contained in:
Magne Sjaastad
2016-11-30 17:36:22 +01:00
parent 22d09c0517
commit 10ddf1eccc
2 changed files with 7 additions and 7 deletions

View File

@@ -424,9 +424,9 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(CPACK_GENERATOR ZIP)
endif()
set(CPACK_PACKAGE_VERSION_MAJOR ${CMAKE_MAJOR_VERSION})
set(CPACK_PACKAGE_VERSION_MINOR ${CMAKE_MINOR_VERSION})
set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_PATCH_VERSION})
set(CPACK_PACKAGE_VERSION_MAJOR ${RESINSIGHT_MAJOR_VERSION})
set(CPACK_PACKAGE_VERSION_MINOR ${RESINSIGHT_MINOR_VERSION})
set(CPACK_PACKAGE_VERSION_PATCH ${RESINSIGHT_PATCH_VERSION})
set(CPACK_PACKAGE_NAME "ResInsight-bin")