mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Fix linux build
This commit is contained in:
parent
ef52927795
commit
b4fd236701
@ -81,12 +81,9 @@ ${CEE_CURRENT_LIST_DIR}RifColumnBasedUserData.cpp
|
|||||||
${CEE_CURRENT_LIST_DIR}RifKeywordVectorUserData.cpp
|
${CEE_CURRENT_LIST_DIR}RifKeywordVectorUserData.cpp
|
||||||
${CEE_CURRENT_LIST_DIR}RifDataSourceForRftPlt.cpp
|
${CEE_CURRENT_LIST_DIR}RifDataSourceForRftPlt.cpp
|
||||||
${CEE_CURRENT_LIST_DIR}RifEclipseUserDataKeywordTools.cpp
|
${CEE_CURRENT_LIST_DIR}RifEclipseUserDataKeywordTools.cpp
|
||||||
<<<<<<<
|
|
||||||
${CEE_CURRENT_LIST_DIR}RifCsvUserData.cpp
|
${CEE_CURRENT_LIST_DIR}RifCsvUserData.cpp
|
||||||
${CEE_CURRENT_LIST_DIR}RifCsvUserDataParser.cpp
|
${CEE_CURRENT_LIST_DIR}RifCsvUserDataParser.cpp
|
||||||
=======
|
|
||||||
${CEE_CURRENT_LIST_DIR}RifWellFormationReader.cpp
|
${CEE_CURRENT_LIST_DIR}RifWellFormationReader.cpp
|
||||||
>>>>>>>
|
|
||||||
|
|
||||||
# HDF5 file reader is directly included in ResInsight main CmakeList.txt
|
# HDF5 file reader is directly included in ResInsight main CmakeList.txt
|
||||||
#${CEE_CURRENT_LIST_DIR}RifHdf5Reader.cpp
|
#${CEE_CURRENT_LIST_DIR}RifHdf5Reader.cpp
|
||||||
|
Loading…
Reference in New Issue
Block a user