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

Fixed building of geo mech lib and odb reader unit tests

Browse Source 
Changed cmake files and unit tests after recent changes that had broken
the builds. Geo mech lib now links with new library
ResultStatisticsCache.
This commit is contained in:
Stein Dale 2015-05-11 14:42:41 +02:00
parent 85f62ec1d4
commit 6b79c92f68
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/GeoMech/GeoMechDataModel/CMakeLists.txt
View File

@ -4,6 +4,8 @@ project (RigGeoMechDataModel)
include_directories( include_directories(
${LibCore_SOURCE_DIR} ${LibCore_SOURCE_DIR}
../../ResultStatisticsCache
../OdbReader
) )
@ -24,4 +26,4 @@ add_library( ${PROJECT_NAME}
RigFemNativeStatCalc.cpp RigFemNativeStatCalc.cpp
) )
target_link_libraries( ${PROJECT_NAME} LibCore ) target_link_libraries( ${PROJECT_NAME} LibCore ResultStatisticsCache)

7
ApplicationCode/GeoMech/OdbReader_UnitTests/CMakeLists.txt
View File

@ -9,14 +9,17 @@ set(RI_TEST_FILE "" CACHE FILEPATH "Path to test file")
include(${RI_VIZ_FWK_ROOT}/CMake/Utils/ceeDetermineCompilerFlags.cmake) include(${RI_VIZ_FWK_ROOT}/CMake/Utils/ceeDetermineCompilerFlags.cmake)
add_subdirectory(${RI_VIZ_FWK_ROOT}/LibCore buildVizFwk) add_subdirectory(${RI_VIZ_FWK_ROOT}/LibCore buildVizFwk)
add_subdirectory(../GeoMechDataModel buildGeoMechDataModel) add_subdirectory(../../ResultStatisticsCache buildResultStatisticsCache)
add_subdirectory(../OdbReader buildOdbReader) add_subdirectory(../OdbReader buildOdbReader)
add_subdirectory(../GeoMechDataModel buildGeoMechDataModel)
add_definitions( -DTEST_FILE="${RI_TEST_FILE}") add_definitions( -DTEST_FILE="${RI_TEST_FILE}")
include_directories(${RI_VIZ_FWK_ROOT}/LibCore) include_directories(${RI_VIZ_FWK_ROOT}/LibCore)
include_directories(../GeoMechDataModel) include_directories(../../ResultStatisticsCache)
include_directories(../../ReservoirDataModel)
include_directories(../OdbReader) include_directories(../OdbReader)
include_directories(../GeoMechDataModel)
include_directories(${RI_GTEST_ROOT}) include_directories(${RI_GTEST_ROOT})
set( UNIT_TEST_CPP_SOURCES set( UNIT_TEST_CPP_SOURCES

3
ApplicationCode/GeoMech/OdbReader_UnitTests/RifOdbReader-Test.cpp
View File

@ -20,6 +20,7 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "RifOdbReader.h" #include "RifOdbReader.h"
#include "RigGeoMechCaseData.h" #include "RigGeoMechCaseData.h"
#include "RigFemPartCollection.h"
#include "cvfDebugTimer.h" #include "cvfDebugTimer.h"
@ -34,7 +35,7 @@ TEST(OdbReaderTest, BasicTests)
std::cout << TEST_FILE << std::endl; std::cout << TEST_FILE << std::endl;
std::cout << std::endl; std::cout << std::endl;
cvf::ref<RifOdbReader> reader = new RifOdbReader; cvf::ref<RifOdbReader> reader = new RifOdbReader;
cvf::ref<RigGeoMechCaseData> femCase = new RigGeoMechCaseData; cvf::ref<RigGeoMechCaseData> femCase = new RigGeoMechCaseData("");
cvf::ref<RigFemPartCollection> femData = femCase->femParts(); cvf::ref<RigFemPartCollection> femData = femCase->femParts();
cvf::DebugTimer timer("DebugTimer"); cvf::DebugTimer timer("DebugTimer");