Added list of files in CMakeLists_files.cmake

Do not use precompiled headers for ReservoirDataModel files p4#: 20506
2025-02-25 18:55:39 -06:00 · 2013-02-13 14:50:37 +01:00
parent 33a6157906
commit b8e663da03
14 changed files with 96 additions and 28 deletions
--- a/ApplicationCode/CMakeLists.txt
+++ b/ApplicationCode/CMakeLists.txt
@@ -93,19 +93,14 @@ list( APPEND CPP_SOURCES
    ProjectDataModel/RimUiTreeView.cpp
 )

+# Populate the filenames into variable lists
+include ("ReservoirDataModel/CMakeLists_files.cmake")
 list( APPEND CPP_SOURCES
-    ReservoirDataModel/RigCell.cpp
-    ReservoirDataModel/RigGridBase.cpp
-    ReservoirDataModel/RigReservoirCellResults.cpp 
-    ReservoirDataModel/RigLocalGrid.cpp
-    ReservoirDataModel/RigMainGrid.cpp
-    ReservoirDataModel/RigEclipseCase.cpp
-    ReservoirDataModel/RigReservoirBuilderMock.cpp
-    ReservoirDataModel/RigWellResults.cpp
-    ReservoirDataModel/RigGridScalarDataAccess.cpp
-    ReservoirDataModel/RigActiveCellInfo.cpp
+    ${CODE_SOURCE_FILES}
 )

+message(${CODE_SOURCE_FILES}) 
+
 list( APPEND CPP_SOURCES
    UserInterface/RICursors.cpp
    UserInterface/RIMainWindow.cpp
@@ -157,13 +152,13 @@ qt4_add_resources( QRC_FILES_CPP ${QRC_FILES} )

 set( RAW_SOURCES ${CPP_SOURCES} )
 list( REMOVE_ITEM RAW_SOURCES RIStdInclude.cpp)
-list( REMOVE_ITEM RAW_SOURCES ReservoirDataModel/RigReaderInterfaceECL.cpp)
-list( REMOVE_ITEM RAW_SOURCES ReservoirDataModel/RigGridScalarDataAccess.cpp)
-list( REMOVE_ITEM RAW_SOURCES ReservoirDataModel/RigActiveCellInfo.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)

--- a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
+++ b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
@@ -0,0 +1,36 @@
+
+# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly 
+if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
+    set(CEE_CURRENT_LIST_DIR  ${CMAKE_CURRENT_LIST_DIR}/)
+endif()
+
+
+list(APPEND CODE_HEADER_FILES
+${CEE_CURRENT_LIST_DIR}RigActiveCellInfo.h
+${CEE_CURRENT_LIST_DIR}RigCell.h
+${CEE_CURRENT_LIST_DIR}RigEclipseCase.h
+${CEE_CURRENT_LIST_DIR}RigGridBase.h
+${CEE_CURRENT_LIST_DIR}RigGridCollection.h
+${CEE_CURRENT_LIST_DIR}RigGridScalarDataAccess.h
+${CEE_CURRENT_LIST_DIR}RigLocalGrid.h
+${CEE_CURRENT_LIST_DIR}RigMainGrid.h
+${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.h
+${CEE_CURRENT_LIST_DIR}RigReservoirCellResults.h
+${CEE_CURRENT_LIST_DIR}RigWellResults.h
+)
+
+list(APPEND CODE_SOURCE_FILES
+${CEE_CURRENT_LIST_DIR}RigActiveCellInfo.cpp
+${CEE_CURRENT_LIST_DIR}RigCell.cpp
+${CEE_CURRENT_LIST_DIR}RigEclipseCase.cpp
+${CEE_CURRENT_LIST_DIR}RigGridBase.cpp
+${CEE_CURRENT_LIST_DIR}RigGridCollection.cpp
+${CEE_CURRENT_LIST_DIR}RigGridScalarDataAccess.cpp
+${CEE_CURRENT_LIST_DIR}RigLocalGrid.cpp
+${CEE_CURRENT_LIST_DIR}RigMainGrid.cpp
+${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.cpp
+${CEE_CURRENT_LIST_DIR}RigReservoirCellResults.cpp
+${CEE_CURRENT_LIST_DIR}RigWellResults.cpp
+)
+
+
--- a/ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt
+++ b/ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt
@@ -24,7 +24,9 @@ include_directories(
    ${ResInsight_SOURCE_DIR}/CommonCode
 )

-file( GLOB CPP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../*.cpp )
+# Populate the filenames into variable lists
+include ("${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists_files.cmake")
+

 set( UNIT_TEST_CPP_SOURCES
    main.cpp
@@ -36,7 +38,6 @@ set( UNIT_TEST_CPP_SOURCES
 #############################################################################
 # Adds folders for Visual Studio solution explorer (and for Xcode explorer)
 #############################################################################
-source_group( "ResInsight"      FILES ${CPP_SOURCES} )
 source_group( "UnitTests"       FILES ${UNIT_TEST_CPP_SOURCES} )


@@ -58,8 +59,9 @@ set( LINK_LIBRARIES


 add_executable( ${ProjectName}
-    ${CPP_SOURCES}
+    ${CODE_SOURCE_FILES}
    ${UNIT_TEST_CPP_SOURCES}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists_files.cmake

    ${ResInsight_SOURCE_DIR}/ThirdParty/gtest/gtest-all.cc
 )
--- a/ApplicationCode/ReservoirDataModel/RigCell.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigCell.cpp
@@ -16,11 +16,11 @@
 //
 /////////////////////////////////////////////////////////////////////////////////

-#include "RIStdInclude.h"

 #include "RigCell.h"
 #include "RigMainGrid.h"
 #include "cvfPlane.h"
+#include "cvfRay.h"

 static size_t undefinedCornersArray[8] = {cvf::UNDEFINED_SIZE_T,
                                          cvf::UNDEFINED_SIZE_T,
--- a/ApplicationCode/ReservoirDataModel/RigEclipseCase.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigEclipseCase.cpp
@@ -16,7 +16,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////

-#include "RIStdInclude.h"
 #include "RigEclipseCase.h"
 #include "RigMainGrid.h"
 #include "RigReservoirCellResults.h"
--- a/ApplicationCode/ReservoirDataModel/RigGridBase.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigGridBase.cpp
@@ -16,7 +16,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////

-#include "RIStdInclude.h"
 #include "RigGridBase.h"
 #include "RigMainGrid.h"
 #include "RigCell.h"
--- a/ApplicationCode/ReservoirDataModel/RigGridCollection.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigGridCollection.cpp
@@ -0,0 +1,20 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2011-2012 Statoil ASA, Ceetron AS
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RigGridCollection.h"
+
--- a/ApplicationCode/ReservoirDataModel/RigGridCollection.h
+++ b/ApplicationCode/ReservoirDataModel/RigGridCollection.h
@@ -0,0 +1,20 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2011-2012 Statoil ASA, Ceetron AS
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
--- a/ApplicationCode/ReservoirDataModel/RigLocalGrid.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigLocalGrid.cpp
@@ -16,7 +16,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////

-#include "RIStdInclude.h"
 #include "RigLocalGrid.h"


--- a/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
@@ -16,8 +16,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////

-#include "RIStdInclude.h"
-
 #include "RigMainGrid.h"

 #include "cvfAssert.h"
--- a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
@@ -16,8 +16,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////

-#include "RIStdInclude.h"
-
 #include "RigReservoirBuilderMock.h"
 #include "RigEclipseCase.h"

--- a/ApplicationCode/ReservoirDataModel/RigReservoirCellResults.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigReservoirCellResults.cpp
@@ -16,8 +16,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////

-#include "RIStdInclude.h"
-
 #include "RigReservoirCellResults.h"
 #include "RifReaderInterface.h"
 #include "RigMainGrid.h"
--- a/ApplicationCode/ReservoirDataModel/RigWellResults.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigWellResults.cpp
@@ -16,11 +16,10 @@
 //
 /////////////////////////////////////////////////////////////////////////////////

-#include "RIStdInclude.h"
-
 #include "RigWellResults.h"
 #include <map>

+#include <QDebug>

 //--------------------------------------------------------------------------------------------------
 /// 
--- a/ApplicationCode/ReservoirDataModel/RigWellResults.h
+++ b/ApplicationCode/ReservoirDataModel/RigWellResults.h
@@ -18,8 +18,13 @@

 #pragma once

+#include "cvfBase.h"
+#include "cvfObject.h"
+#include "cvfMath.h"
+
 #include "RimDefines.h"
 #include <QDateTime>
+#include <vector>

 struct RigWellResultCell
 {