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

#1747 Build System : Include hdf5 in package name

Browse Source
This commit is contained in:
Magne Sjaastad
2017-08-08 13:07:49 +02:00
parent cc4789d79c
commit fb158b29bd
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/CMakeLists.txt
View File

@@ -197,7 +197,7 @@ if(MSVC)
${RESINSIGHT_HDF5_DIR}/lib/libszip.lib ${RESINSIGHT_HDF5_DIR}/lib/libszip.lib
) )
set(RESINSIGHT_USE_HDF5 1) set(RESINSIGHT_USE_HDF5 1 PARENT_SCOPE)
message( STATUS "Using HDF5 from : ${RESINSIGHT_HDF5_DIR}" ) message( STATUS "Using HDF5 from : ${RESINSIGHT_HDF5_DIR}" )
endif() endif()
else() else()
@@ -211,7 +211,7 @@ else()
${HDF5_LIBRARIES} ${HDF5_LIBRARIES}
) )
set(RESINSIGHT_USE_HDF5 1) set(RESINSIGHT_USE_HDF5 1 PARENT_SCOPE)
message( STATUS "Using HDF5 libraries : ${HDF5_LIBRARIES}" ) message( STATUS "Using HDF5 libraries : ${HDF5_LIBRARIES}" )
endif() endif()
endif() endif()

3
CMakeLists.txt
View File

@@ -431,6 +431,9 @@ if(NOT ${OCTAVE_VERSION_STRING} EQUAL "")
set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}_oct-${OCTAVE_VERSION_STRING}") set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}_oct-${OCTAVE_VERSION_STRING}")
endif() endif()
if(RESINSIGHT_USE_HDF5)
set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}_hdf5")
endif()
# Append el5 when compiled on RHEL5 and el6 if compiled on RHEL6 # Append el5 when compiled on RHEL5 and el6 if compiled on RHEL6
if (NOT "${RESINSIGHT_RHEL_SYSTEM_NAME}" STREQUAL "") if (NOT "${RESINSIGHT_RHEL_SYSTEM_NAME}" STREQUAL "")