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

Moved include_directory from main to ApplicationCode. Include of Eclipse hearder files must now be prefixed with ert/<module_name>

Browse Source
This commit is contained in:
Magne Sjaastad 2016-05-26 14:49:13 +02:00
parent f0dc0abada
commit 1929798532
12 changed files with 66 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ApplicationCode/CMakeLists.txt
View File

@ -23,6 +23,9 @@ include_directories(
${CommonCode_SOURCE_DIR}
${ResInsight_SOURCE_DIR}/ThirdParty
${ResInsight_SOURCE_DIR}/ThirdParty/NRLib/nrlib/well
${ResInsight_SOURCE_DIR}/ThirdParty/Qwt/src
${ERT_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/Adm
@ -355,41 +358,12 @@ endif ()
set( LINK_LIBRARIES
WellPathImportSsihub
# cafPdmCvf
# cafUserInterface
# cafProjectDataModel
# cafViewer
# cafAnimControl
# cafTensor
# CommonCode
#cafPdmCore
#cafPdmUiCore
cafPdmXml
#cafProjectDataModel
cafUserInterface
cafViewer
cafAnimControl
cafCommand
cafPdmCvf
cafTensor
CommonCode
LibGuiQt
LibViewing
LibRender
LibGeometry
LibCore
ResultStatisticsCache
RigGeoMechDataModel
ecl
ert_util
ert_geometry
ecl_well
${APP_FWK_LIBRARIES}
${VIZ_FWK_LIBRARIES}
${ERT_LIBRARIES}
NRLib

6
ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@ -38,10 +38,8 @@
#include <QTextStream>
#include <QDebug>
#include "ecl_grid.h"
#include "util.h"
#include "well_state.h"
#include "ert/ecl/ecl_box.h"
#include "ert/ecl/ecl_kw.h"
QString includeKeyword("INCLUDE");
QString faultsKeyword("FAULTS");

8
ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
View File

@ -20,11 +20,9 @@
#include "RifEclipseOutputFileTools.h"
#include "util.h"
#include "ecl_file.h"
#include "ecl_kw_magic.h"
#include "ecl_grid.h"
#include "ecl_rsthead.h"
#include "ert/ecl/ecl_file.h"
#include "ert/ecl/ecl_grid.h"
#include "ert/ecl/ecl_kw_magic.h"
#include "cafProgressInfo.h"

2
ApplicationCode/FileInterface/RifEclipseOutputFileTools.h
View File

@ -29,7 +29,7 @@
#include <QDateTime>
#include "RifReaderInterface.h"
#include "ecl_util.h"
#include "ert/ecl/ecl_util.h"
typedef struct ecl_file_struct ecl_file_type;

2
ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h
View File

@ -29,7 +29,7 @@
#include <vector>
#include "well_info.h"
#include "ert/ecl_well/well_info.h"
#include "RifReaderInterface.h"

2
ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp
View File

@ -20,7 +20,7 @@
#include "RifReaderEclipseSummary.h"
#include "ecl_util.h"
#include "ert/ecl/ecl_util.h"
#include <iostream>

7
ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp
View File

@ -21,11 +21,8 @@
#include "RifEclipseUnifiedRestartFileAccess.h"
#include "RifEclipseOutputFileTools.h"
#include "ecl_kw_magic.h"
#include <well_state.h>
#include <well_info.h>
#include <well_conn.h>
#include <well_ts.h>
#include "ert/ecl/ecl_file.h"
#include "ert/ecl/ecl_kw_magic.h"
//--------------------------------------------------------------------------------------------------
/// Constructor

2
ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.h
View File

@ -26,7 +26,7 @@ class RifEclipseOutputFileTools;
//typedef struct ecl_file_struct ecl_file_type;
#include "well_info.h"
#include "ert/ecl_well/well_info.h"
//==================================================================================================
//

15
ApplicationCode/FileInterface/RifReaderEclipseInput.cpp
View File

@ -18,23 +18,10 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "cvfBase.h"
#include "RigMainGrid.h"
#include "RigCaseData.h"
#include "RigCaseCellResultsData.h"
#include "RifReaderEclipseInput.h"
#include "RifReaderEclipseOutput.h"
#include "RifEclipseInputFileTools.h"
#include <iostream>
#include <cmath>
#include "ecl_grid.h"
#include "well_state.h"
#include "util.h"
#include "RigCaseData.h"
//==================================================================================================
//

6
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -32,10 +32,8 @@
#include "cafProgressInfo.h"
#include "ecl_grid.h"
#include "well_state.h"
#include "ecl_kw_magic.h"
#include "ecl_nnc_export.h"
#include "ert/ecl/ecl_nnc_export.h"
#include "ert/ecl/ecl_kw_magic.h"
#include <iostream>
#include <map>

2
ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@ -18,7 +18,7 @@
#include "RifReaderEclipseSummary.h"
#include "ecl_sum.h"
#include "ert/ecl/ecl_sum.h"
#include <string>
#include <assert.h>

99
CMakeLists.txt
View File

@ -65,48 +65,35 @@ SET(EXT_ERT_ROOT "" CACHE STRING "Path to ERT CMakeList.txt (source path)")
if (ERT_EXTERNAL)
if (EXT_ERT_ROOT)
set(ERT_SOURCE_PATH "${EXT_ERT_ROOT}")
set(ERT_INCLUDE_ROOT "${EXT_ERT_ROOT}")
add_subdirectory(${ERT_SOURCE_PATH} ${CMAKE_BINARY_DIR}/ThirdParty/Ert)
include_directories(
${ERT_SOURCE_PATH}/libecl/include/ert/ecl
${ERT_SOURCE_PATH}/libert_util/include/ert/util
${ERT_SOURCE_PATH}/libgeometry/include/ert/geometry
${ERT_SOURCE_PATH}/libecl_well/include/ert/ecl_well
${ERT_SOURCE_PATH}/libecl/include
${ERT_SOURCE_PATH}/libert_util/include
${ERT_SOURCE_PATH}/libgeometry/include
${ERT_SOURCE_PATH}/libecl_well/include
${CMAKE_BINARY_DIR}/ThirdParty/Ert/libert_util/include/ert/util
${CMAKE_BINARY_DIR}/ThirdParty/Ert/libert_util/include
)
endif(EXT_ERT_ROOT)
else (ERT_EXTERNAL)
endif()
else()
set(ERT_INCLUDE_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel)
add_subdirectory(ThirdParty/Ert/devel)
include_directories(
${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libecl/include/ert/ecl
${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libert_util/include/ert/util
${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libgeometry/include/ert/geometry
${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well
${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libecl/include
${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libecl/include
${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libert_util/include
${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libgeometry/include
${CMAKE_SOURCE_DIR}/ThirdParty/Ert/devel/libecl_well/include
endif ()
list(APPEND ERT_INCLUDE_DIRS
${ERT_INCLUDE_ROOT}/libecl/include/
${ERT_INCLUDE_ROOT}/libert_util/include/
${ERT_INCLUDE_ROOT}/libgeometry/include/
${ERT_INCLUDE_ROOT}/libecl_well/include/
${ERT_INCLUDE_ROOT}/libeclxx/include
${ERT_INCLUDE_ROOT}/libert_utilxx/include
${CMAKE_BINARY_DIR}/ThirdParty/Ert/devel/libert_util/include/ert/util
${CMAKE_BINARY_DIR}/ThirdParty/Ert/devel/libert_util/include/ert/util
${CMAKE_BINARY_DIR}/ThirdParty/Ert/devel/libert_util/include
)
endif (ERT_EXTERNAL)
)
list(APPEND ERT_LIBRARIES
ecl
ecl_well
ert_geometry
ert_util
)
set_property(TARGET
ecl
ecl_well
ert_geometry
ert_util
PROPERTY FOLDER "ERT"
${ERT_LIBRARIES}
PROPERTY FOLDER "ERT"
)
@ -115,7 +102,6 @@ set_property(TARGET
################################################################################
add_subdirectory(ThirdParty/NRLib)
include_directories(ThirdParty/NRLib/nrlib/well)
################################################################################
@ -141,7 +127,6 @@ find_package( OpenGL )
################################################################################
add_subdirectory(ThirdParty/Qwt/src)
include_directories(ThirdParty/Qwt/src)
################################################################################
# Vizualization Framework
@ -182,13 +167,17 @@ include_directories(
${LibGuiQt_SOURCE_DIR}
)
list(APPEND VIZ_FWK_LIBRARIES
LibGuiQt
LibViewing
LibRender
LibGeometry
LibCore
)
set_property(TARGET
LibCore
LibGeometry
LibGuiQt
LibRender
LibViewing
PROPERTY FOLDER "VizFwk"
${VIZ_FWK_LIBRARIES}
PROPERTY FOLDER "VizFwk"
)
@ -213,23 +202,25 @@ add_subdirectory(Fwk/AppFwk/CommonCode)
add_subdirectory(Fwk/AppFwk/cafTensor)
set_property(TARGET
cafAnimControl
cafViewer
list(APPEND APP_FWK_LIBRARIES
cafPdmCore
cafPdmUiCore
cafPdmXml
cafProjectDataModel
cafUserInterface
cafViewer
cafAnimControl
cafCommand
cafUserInterface
cafPdmCvf
cafTensor
cafPdmCvf
CommonCode
PROPERTY FOLDER "AppFwk"
CommonCode
)
set_property(TARGET
${APP_FWK_LIBRARIES}
PROPERTY FOLDER "AppFwk"
)
################################################################################
# Installation settings