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

Results Storage: Fixed the Previous build error by moving the RigStatistics class.

Browse Source 
Cleaned up a bit in the ApplicationCode/CMakeList.txt
p4#: 20946
This commit is contained in:
Jacob Støren 2013-03-18 14:51:31 +01:00
parent f7248f3999
commit 9da6b0a10b
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/CMakeLists.txt
View File

@ -86,6 +86,7 @@ list( APPEND CPP_SOURCES
ProjectDataModel/RimUiTreeModelPdm.cpp ProjectDataModel/RimUiTreeModelPdm.cpp
ProjectDataModel/RimUiTreeView.cpp ProjectDataModel/RimUiTreeView.cpp
ProjectDataModel/RimReservoirCellResultsCacher.cpp ProjectDataModel/RimReservoirCellResultsCacher.cpp
ProjectDataModel/RigStatistics.cpp
) )
# Populate the filenames into variable lists # Populate the filenames into variable lists
@ -153,20 +154,20 @@ qt4_add_resources( QRC_FILES_CPP ${QRC_FILES} )
############################################################################# #############################################################################
set( RAW_SOURCES ${CPP_SOURCES} ) set( RAW_SOURCES ${CPP_SOURCES} )
list( REMOVE_ITEM RAW_SOURCES RIStdInclude.cpp)
list( REMOVE_ITEM RAW_SOURCES ${CODE_SOURCE_FILES})
list( REMOVE_ITEM RAW_SOURCES ModelVisualization/RivCellEdgeEffectGenerator.cpp)
list( REMOVE_ITEM RAW_SOURCES ModelVisualization/RivPipeGeometryGenerator.cpp)
list( REMOVE_ITEM RAW_SOURCES ModelVisualization/RivWellPipesPartMgr.cpp)
list( REMOVE_ITEM RAW_SOURCES ModelVisualization/RivWellHeadPartMgr.cpp)
list( REMOVE_ITEM RAW_SOURCES Application/RiaImageFileCompare.cpp)
list( REMOVE_ITEM RAW_SOURCES Application/RiaImageCompareReporter.cpp)
list( REMOVE_ITEM RAW_SOURCES list( REMOVE_ITEM RAW_SOURCES
RIStdInclude.cpp
${CODE_SOURCE_FILES}
ModelVisualization/RivCellEdgeEffectGenerator.cpp
ModelVisualization/RivPipeGeometryGenerator.cpp
ModelVisualization/RivWellPipesPartMgr.cpp
ModelVisualization/RivWellHeadPartMgr.cpp
Application/RiaImageFileCompare.cpp
Application/RiaImageCompareReporter.cpp
FileInterface/RifEclipseInputFileTools.cpp FileInterface/RifEclipseInputFileTools.cpp
FileInterface/RifEclipseOutputFileTools.cpp FileInterface/RifEclipseOutputFileTools.cpp
FileInterface/RifEclipseRestartFilesetAccess.cpp FileInterface/RifEclipseRestartFilesetAccess.cpp
@ -174,9 +175,9 @@ list( REMOVE_ITEM RAW_SOURCES
FileInterface/RifEclipseUnifiedRestartFileAccess.cpp FileInterface/RifEclipseUnifiedRestartFileAccess.cpp
FileInterface/RifReaderEclipseInput.cpp FileInterface/RifReaderEclipseInput.cpp
FileInterface/RifReaderEclipseOutput.cpp FileInterface/RifReaderEclipseOutput.cpp
UserInterface/RiuSimpleHistogramWidget.cpp UserInterface/RiuSimpleHistogramWidget.cpp
UserInterface/RiuMultiCaseImportDialog.cpp UserInterface/RiuMultiCaseImportDialog.cpp
) )
include( CustomPCH.cmake ) include( CustomPCH.cmake )

1
ApplicationCode/ReservoirDataModel/RigStatistics.cpp → ApplicationCode/ProjectDataModel/RigStatistics.cpp
View File

@ -15,6 +15,7 @@
// for more details. // for more details.
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RIStdInclude.h"
#include "RigStatistics.h" #include "RigStatistics.h"
#include "RigReservoirCellResults.h" #include "RigReservoirCellResults.h"

0
ApplicationCode/ReservoirDataModel/RigStatistics.h → ApplicationCode/ProjectDataModel/RigStatistics.h
View File

2
ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
View File

@ -16,7 +16,6 @@ ${CEE_CURRENT_LIST_DIR}RigLocalGrid.h
${CEE_CURRENT_LIST_DIR}RigMainGrid.h ${CEE_CURRENT_LIST_DIR}RigMainGrid.h
${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.h ${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.h
${CEE_CURRENT_LIST_DIR}RigReservoirCellResults.h ${CEE_CURRENT_LIST_DIR}RigReservoirCellResults.h
${CEE_CURRENT_LIST_DIR}RigStatistics.h
${CEE_CURRENT_LIST_DIR}RigWellResults.h ${CEE_CURRENT_LIST_DIR}RigWellResults.h
) )
@ -31,7 +30,6 @@ ${CEE_CURRENT_LIST_DIR}RigLocalGrid.cpp
${CEE_CURRENT_LIST_DIR}RigMainGrid.cpp ${CEE_CURRENT_LIST_DIR}RigMainGrid.cpp
${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.cpp ${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.cpp
${CEE_CURRENT_LIST_DIR}RigReservoirCellResults.cpp ${CEE_CURRENT_LIST_DIR}RigReservoirCellResults.cpp
${CEE_CURRENT_LIST_DIR}RigStatistics.cpp
${CEE_CURRENT_LIST_DIR}RigWellResults.cpp ${CEE_CURRENT_LIST_DIR}RigWellResults.cpp
) )