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

Added opm-common as include directory to Commands project.

Browse Source 
Fixed other deprecated class object instantiations.
This commit is contained in:
Ruben Thoms 2020-11-13 12:08:53 +01:00 committed by Magne Sjaastad
parent eea9e88bfe
commit c4ec51fd8b
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/CMakeLists.txt
View File

@ -56,7 +56,9 @@ add_library(
target_include_directories(
${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/ThirdParty)
${CMAKE_SOURCE_DIR}/ThirdParty
${CMAKE_SOURCE_DIR}/ThirdParty/custom-opm-common/generated-opm-common
${CMAKE_SOURCE_DIR}/ThirdParty/custom-opm-common/opm-common)
# Before cmake 3.12 OBJECT libraries could not use the target_link_libraries
# command, So we need to set the POSITION_INDEPENDENT_CODE option manually

2
ApplicationCode/ProjectDataModel/RimVfpPlot.cpp
View File

@ -617,7 +617,7 @@ QList<caf::PdmOptionItemInfo> RimVfpPlot::calculateValueOptions( const caf::PdmF
{
if ( m_case && m_case->eclipseCaseData() )
{
caf::QIconProvider simWellIcon( ":/Well.png" );
caf::IconProvider simWellIcon( ":/Well.png" );
const std::set<QString> sortedWellNameSet = m_case->eclipseCaseData()->findSortedWellNames();
for ( const QString& name : sortedWellNameSet )
{

2
ApplicationCode/ProjectDataModel/RimVfpPlot.h
View File

@ -86,7 +86,7 @@ public:
private:
// RimPlot implementations
void doRemoveFromCollection() override;
void doRemoveFromCollection();
// RimViewWindow implementations
void deleteViewWidget() override;

4
ApplicationCode/ProjectDataModel/RimVfpTableExtractor.cpp
View File

@ -36,8 +36,8 @@
// #include <QDir>
// #include <QFileInfo>
#include "opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp"
#include "opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp"
// #include "opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp"
// #include "opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp"
#include "opm/parser/eclipse/Parser/Parser.hpp"
//--------------------------------------------------------------------------------------------------