From 0ca0f1a0e81f01e5c8404abd94a76fe5ac9b1f83 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Tue, 4 Aug 2015 09:19:52 +0200
Subject: [PATCH] Fixed includes for unit tests

---
 .../ModelVisualization_UnitTests/CMakeLists.txt            | 7 +++----
 .../ReservoirDataModel_UnitTests/CMakeLists.txt            | 5 ++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/CMakeLists.txt b/ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/CMakeLists.txt
index 3f8c05e07e..3d3f29de52 100644
--- a/ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/CMakeLists.txt
+++ b/ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/CMakeLists.txt
@@ -10,11 +10,10 @@ include_directories(
     ${LibViewing_SOURCE_DIR}
 
     ${ResInsight_SOURCE_DIR}/ThirdParty
-    ${ResInsight_SOURCE_DIR}/CommonCode
-
-    ${CMAKE_CURRENT_SOURCE_DIR}/..
-
 
+    ${ResInsight_SOURCE_DIR}/ApplicationCode/ModelVisualization
+    
+    ${CommonCode_SOURCE_DIR}
 )
 
 set( MODEL_VISUALIZATION_CPP_SOURCES
diff --git a/ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt b/ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt
index b066ea1698..8b5565fbfb 100644
--- a/ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt
+++ b/ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt
@@ -20,7 +20,10 @@ include_directories(
     ${ResInsight_SOURCE_DIR}/ApplicationCode/ProjectDataModel
     ${ResInsight_SOURCE_DIR}/ThirdParty
 
-    ${ResInsight_SOURCE_DIR}/Fwk/AppFwk/cafProjectDataModel
+    #${ResInsight_SOURCE_DIR}/Fwk/AppFwk/cafProjectDataModel
+
+	${cafProjectDataModel_SOURCE_DIR}
+	${cafPdmCore_SOURCE_DIR}
 
     ${ResInsight_SOURCE_DIR}/Fwk/AppFwk/CommonCode