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

#1794 Rename flag to RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING

Browse Source
This commit is contained in:
Magne Sjaastad 2017-08-21 11:49:49 +02:00
parent 51c30448e9
commit dde03dcc8c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -141,8 +141,8 @@ endif(RESINSIGHT_ERT_EXTERNAL_LIB_ROOT OR RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT)
################################################################################ ################################################################################
# HDF5 # HDF5
################################################################################ ################################################################################
option (RESINSIGHT_USE_HDF5 "Use HDF5 library" OFF) option (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING "Enable prototype feature Souring (requires third party library HDF5)" OFF)
if (RESINSIGHT_USE_HDF5) if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)
if(MSVC) if(MSVC)
# Must specyfy libraries manually # Must specyfy libraries manually
# Using find_package causes linking of zlib, and crashes with linking of zlib defined by Qt # Using find_package causes linking of zlib, and crashes with linking of zlib defined by Qt
@ -183,7 +183,7 @@ if (RESINSIGHT_USE_HDF5)
message( WARNING "Use of HDF5 is enabled, but no HDF5 is found." ) message( WARNING "Use of HDF5 is enabled, but no HDF5 is found." )
endif() # HDF5_FOUND endif() # HDF5_FOUND
endif() # MSVC endif() # MSVC
endif() # RESINSIGHT_USE_HDF5 endif() # RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING
################################################################################ ################################################################################
@ -492,7 +492,7 @@ if(NOT ${OCTAVE_VERSION_STRING} EQUAL "")
endif() endif()
if(RESINSIGHT_FOUND_HDF5) if(RESINSIGHT_FOUND_HDF5)
set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}_hdf5") set (RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}_souring")
endif() 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