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 : Include odb and octave in package name

Browse Source
This commit is contained in:
Magne Sjaastad
2016-12-01 08:26:58 +01:00
parent 10ddf1eccc
commit 18abc03825
1 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
CMakeLists.txt
View File

@@ -424,14 +424,45 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(CPACK_GENERATOR ZIP)
endif()
set(CPACK_PACKAGE_VERSION_MAJOR ${RESINSIGHT_MAJOR_VERSION})
set(CPACK_PACKAGE_VERSION_MINOR ${RESINSIGHT_MINOR_VERSION})
set(CPACK_PACKAGE_VERSION_PATCH ${RESINSIGHT_PATCH_VERSION})
if(NOT ${RESINSIGHT_OCTAVE_PLUGIN_MKOCTFILE} EQUAL "")
get_filename_component(RESINSIGHT_OCTAVE_DIRECTORY ${RESINSIGHT_OCTAVE_PLUGIN_MKOCTFILE} DIRECTORY)
execute_process (COMMAND octave-config -v
WORKING_DIRECTORY ${RESINSIGHT_OCTAVE_DIRECTORY}
OUTPUT_VARIABLE OCTAVE_VERSION_STRING
OUTPUT_STRIP_TRAILING_WHITESPACE)
endif ()
set(CPACK_PACKAGE_NAME "ResInsight-bin")
if (NOT "${RESINSIGHT_PLATFORM}" STREQUAL "")
set (CPACK_SYSTEM_NAME "${RESINSIGHT_PLATFORM}")
# Handling of system name on Windows
if(${CMAKE_SYSTEM_NAME} MATCHES Windows)
if(CMAKE_CL_64)
set(CPACK_SYSTEM_NAME win64)
else()
set(CPACK_SYSTEM_NAME win32)
endif()
endif()
set(RESINSIGHT_PACKAGE_NAME "ResInsight-bin")
if(NOT ${RESINSIGHT_ODB_API_DIR} EQUAL "")
set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}-odb")
endif()
if(NOT ${OCTAVE_VERSION_STRING} EQUAL "")
set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}-oct-${OCTAVE_VERSION_STRING}")
endif()
set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}-${STRPRODUCTVER}")
# Append el5 when compiled on RHEL5 and el6 if compiled on RHEL6
if (NOT "${RESINSIGHT_PLATFORM}" STREQUAL "")
set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}-${RESINSIGHT_PLATFORM}")
else()
set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}-${CPACK_SYSTEM_NAME}")
endif()
message("RESINSIGHT_PACKAGE_NAME : " ${RESINSIGHT_PACKAGE_NAME})
set(CPACK_PACKAGE_FILE_NAME ${RESINSIGHT_PACKAGE_NAME})
include (CPack)