Fixed building of geo mech lib and odb reader unit tests

Changed cmake files and unit tests after recent changes that had broken
the builds. Geo mech lib now links with new library
ResultStatisticsCache.

ApplicationCode/GeoMech/GeoMechDataModel/CMakeLists.txt

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

ApplicationCode/GeoMech/OdbReader_UnitTests/CMakeLists.txt

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

ApplicationCode/GeoMech/OdbReader_UnitTests/RifOdbReader-Test.cpp

@@ -20,6 +20,7 @@
 #include "gtest/gtest.h"
 #include "RifOdbReader.h"
 #include "RigGeoMechCaseData.h"
+#include "RigFemPartCollection.h"
 
 #include "cvfDebugTimer.h"
 
@@ -34,7 +35,7 @@ TEST(OdbReaderTest, BasicTests)
     std::cout << TEST_FILE << std::endl;
     std::cout << std::endl;
     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::DebugTimer timer("DebugTimer");