OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1014 System : Use RESINSIGHT_MAJOR_VERSION and RESINSIGHT_MINOR_VERSION

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
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")

8
ResInsightVersion.cmake
View File

@ -1,7 +1,7 @@
set(CMAKE_MAJOR_VERSION 2016)
set(CMAKE_MINOR_VERSION 11)
set(CMAKE_PATCH_VERSION 0)
set(RESINSIGHT_MAJOR_VERSION 2016)
set(RESINSIGHT_MINOR_VERSION 11)
set(RESINSIGHT_PATCH_VERSION 0)
set(DEV_VERSION "flow.1")
@ -14,5 +14,5 @@ set(ERT_GITHUB_SHA "236164870f011305aed2eca85c45944b021e4107")
set(OPM_COMMON_GITHUB_SHA "1216bc052542f24ec6fcfbe1947d52e6300ff754")
set(OPM_PARSER_GITHUB_SHA "a3496df501a4369fd827fbf0ff893d03deff425f")
set(STRPRODUCTVER ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${DEV_VERSION})
set(STRPRODUCTVER ${RESINSIGHT_MAJOR_VERSION}.${RESINSIGHT_MINOR_VERSION}.${DEV_VERSION})