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

#1371 Removed dependency on opm-parser

Browse Source
This commit is contained in:
Magne Sjaastad
2017-04-03 21:07:04 +02:00
parent c5ecc19516
commit e1ca217422
4 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/CMakeLists.txt
View File

@@ -30,8 +30,6 @@ include_directories(
${ERT_INCLUDE_DIRS} ${ERT_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${ResInsight_SOURCE_DIR}/ThirdParty/custom-opm-common/opm-common/
${custom-opm-parser_SOURCE_DIR}/opm-parser/
${custom-opm-flowdiagnostics_SOURCE_DIR}/opm-flowdiagnostics/ ${custom-opm-flowdiagnostics_SOURCE_DIR}/opm-flowdiagnostics/
${custom-opm-flowdiag-app_SOURCE_DIR}/opm-flowdiagnostics-applications/ ${custom-opm-flowdiag-app_SOURCE_DIR}/opm-flowdiagnostics-applications/
${custom-opm-flowdiag-app_SOURCE_DIR}/opmCore ${custom-opm-flowdiag-app_SOURCE_DIR}/opmCore
@@ -340,9 +338,6 @@ if(RESINSIGHT_ENABLE_COTIRE)
# multiple QRC files are not supported # multiple QRC files are not supported
set_source_files_properties (qrc_cafAnimControl.cxx PROPERTIES COTIRE_EXCLUDED TRUE) set_source_files_properties (qrc_cafAnimControl.cxx PROPERTIES COTIRE_EXCLUDED TRUE)
# TODO: Revisit why opm-parser is not working
set_source_files_properties (UnitTests/opm-parser-Test.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
# variables at global file scope # variables at global file scope
set_source_files_properties (ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp PROPERTIES COTIRE_EXCLUDED TRUE) set_source_files_properties (ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
@@ -355,12 +350,9 @@ if(RESINSIGHT_ENABLE_COTIRE)
# using namespace cvf # using namespace cvf
set_source_files_properties (GeoMech/GeoMechVisualization/RivFemPartGeometryGenerator.cpp PROPERTIES COTIRE_EXCLUDED TRUE) set_source_files_properties (GeoMech/GeoMechVisualization/RivFemPartGeometryGenerator.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
set_source_files_properties (UnitTests/cvfGeometryTools-Test.cpp PROPERTIES COTIRE_EXCLUDED TRUE) set_source_files_properties (UnitTests/cvfGeometryTools-Test.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
set_source_files_properties (UnitTests/opm-parser-Performance-Test.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
# opm parser # opm parser
set_source_files_properties (ProjectDataModel/RimProject.cpp PROPERTIES COTIRE_EXCLUDED TRUE) set_source_files_properties (ProjectDataModel/RimProject.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
set_source_files_properties (UnitTests/opm-parser-Performance-Test.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
set_source_files_properties (UnitTests/opm-Test.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
set_target_properties(ResInsight PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER FALSE) set_target_properties(ResInsight PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER FALSE)

1
ApplicationCode/UserInterface/RiuMainPlotWindow.cpp
View File

@@ -171,7 +171,6 @@ void RiuMainPlotWindow::createMenus()
QMenu* importMenu = fileMenu->addMenu("&Import"); QMenu* importMenu = fileMenu->addMenu("&Import");
importMenu->addAction(cmdFeatureMgr->action("RicImportEclipseCaseFeature")); importMenu->addAction(cmdFeatureMgr->action("RicImportEclipseCaseFeature"));
importMenu->addAction(cmdFeatureMgr->action("RicImportInputEclipseCaseFeature")); importMenu->addAction(cmdFeatureMgr->action("RicImportInputEclipseCaseFeature"));
//importMenu->addAction(cmdFeatureMgr->action("RicImportInputEclipseCaseOpmFeature"));
importMenu->addAction(cmdFeatureMgr->action("RicImportSummaryCaseFeature")); importMenu->addAction(cmdFeatureMgr->action("RicImportSummaryCaseFeature"));
importMenu->addAction(cmdFeatureMgr->action("RicCreateGridCaseGroupFeature")); importMenu->addAction(cmdFeatureMgr->action("RicCreateGridCaseGroupFeature"));
importMenu->addSeparator(); importMenu->addSeparator();

3
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -322,7 +322,6 @@ void RiuMainWindow::createMenus()
QMenu* importMenu = fileMenu->addMenu("&Import"); QMenu* importMenu = fileMenu->addMenu("&Import");
importMenu->addAction(cmdFeatureMgr->action("RicImportEclipseCaseFeature")); importMenu->addAction(cmdFeatureMgr->action("RicImportEclipseCaseFeature"));
importMenu->addAction(cmdFeatureMgr->action("RicImportInputEclipseCaseFeature")); importMenu->addAction(cmdFeatureMgr->action("RicImportInputEclipseCaseFeature"));
//importMenu->addAction(cmdFeatureMgr->action("RicImportInputEclipseCaseOpmFeature"));
importMenu->addAction(cmdFeatureMgr->action("RicImportSummaryCaseFeature")); importMenu->addAction(cmdFeatureMgr->action("RicImportSummaryCaseFeature"));
importMenu->addAction(cmdFeatureMgr->action("RicCreateGridCaseGroupFeature")); importMenu->addAction(cmdFeatureMgr->action("RicCreateGridCaseGroupFeature"));
importMenu->addSeparator(); importMenu->addSeparator();
@@ -384,8 +383,6 @@ void RiuMainWindow::createMenus()
connect(viewMenu, SIGNAL(aboutToShow()), SLOT(slotRefreshViewActions())); connect(viewMenu, SIGNAL(aboutToShow()), SLOT(slotRefreshViewActions()));
// Debug menu // Debug menu
testMenu->addAction(cmdFeatureMgr->action("RicImportInputEclipseCaseOpmFeature"));
testMenu->addAction(m_mockModelAction); testMenu->addAction(m_mockModelAction);
testMenu->addAction(m_mockResultsModelAction); testMenu->addAction(m_mockResultsModelAction);
testMenu->addAction(m_mockLargeResultsModelAction); testMenu->addAction(m_mockLargeResultsModelAction);

8
CMakeLists.txt
View File

@@ -202,13 +202,10 @@ endif(RESINSIGHT_ERT_EXTERNAL_LIB_ROOT OR RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT)
# Opm # Opm
################################################################################ ################################################################################
add_subdirectory(ThirdParty/custom-opm-parser)
add_subdirectory(ThirdParty/custom-opm-parser/custom-opm-parser-tests)
add_subdirectory(ThirdParty/custom-opm-flowdiagnostics) add_subdirectory(ThirdParty/custom-opm-flowdiagnostics)
add_subdirectory(ThirdParty/custom-opm-flowdiag-app) add_subdirectory(ThirdParty/custom-opm-flowdiag-app)
list(APPEND OPM_LIBRARIES list(APPEND OPM_LIBRARIES
custom-opm-parser
custom-opm-flowdiagnostics custom-opm-flowdiagnostics
custom-opm-flowdiag-app custom-opm-flowdiag-app
) )
@@ -218,11 +215,6 @@ set_property(TARGET
PROPERTY FOLDER "Thirdparty/OPM" PROPERTY FOLDER "Thirdparty/OPM"
) )
set_property(TARGET
opm-parser-tests
PROPERTY FOLDER "Thirdparty/OPM"
)
################################################################################ ################################################################################
# NRLib # NRLib
################################################################################ ################################################################################