Merge pull request #71 from sigurdp/internal

Rewired directory structure for VisualizationModules and Caf

ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt

@@ -15,9 +15,9 @@ include_directories(
     ${ResInsight_SOURCE_DIR}/ApplicationCode/ProjectDataModel
     ${ResInsight_SOURCE_DIR}/ThirdParty
 
-    ${ResInsight_SOURCE_DIR}/cafProjectDataModel
+    ${ResInsight_SOURCE_DIR}/Fwk/AppFwk/cafProjectDataModel
 
-    ${ResInsight_SOURCE_DIR}/CommonCode
+    ${ResInsight_SOURCE_DIR}/Fwk/AppFwk/CommonCode
 
 	#Remove when RigStatistics is out
     ${ResInsight_SOURCE_DIR}/ApplicationCode/ModelVisualization
@@ -47,7 +47,7 @@ source_group( "ReservoirDataModel"       FILES ${CODE_SOURCE_FILES} )
 set( CPP_SOURCES
     ${CPP_SOURCES}
 
-    ${ResInsight_SOURCE_DIR}/cafUserInterface/cafProgressInfo.cpp
+    ${ResInsight_SOURCE_DIR}/Fwk/AppFwk/cafUserInterface/cafProgressInfo.cpp
 )
 
 source_group( "Headers"             FILES ${CODE_HEADER_FILES} )

ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt

@@ -19,9 +19,9 @@ include_directories(
     ${ResInsight_SOURCE_DIR}/ApplicationCode/ProjectDataModel
     ${ResInsight_SOURCE_DIR}/ThirdParty
 
-    ${ResInsight_SOURCE_DIR}/cafProjectDataModel
+    ${ResInsight_SOURCE_DIR}/Fwk/AppFwk/cafProjectDataModel
 
-    ${ResInsight_SOURCE_DIR}/CommonCode
+    ${ResInsight_SOURCE_DIR}/Fwk/AppFwk/CommonCode
 
 	#Remove when RigStatistics is out
     #${ResInsight_SOURCE_DIR}/ApplicationCode/ModelVisualization
@@ -33,7 +33,7 @@ include ("${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists_files.cmake")
 
 set( UNIT_TEST_CPP_SOURCES
 
-    ${ResInsight_SOURCE_DIR}/cafUserInterface/cafProgressInfo.cpp
+    ${ResInsight_SOURCE_DIR}/Fwk/AppFwk/cafUserInterface/cafProgressInfo.cpp
 
     main.cpp
     RigActiveCellInfo-Test.cpp

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 2.8)
 
 project (ResInsight)
 
-set (VIZ_MODULES_FOLDER_NAME VisualizationModules)
+set (VIZ_MODULES_FOLDER_NAME Fwk/VizFwk)
 
 
 
@@ -98,12 +98,12 @@ include_directories(
 # Ceetron Application Framework
 ################################################################################
 
-add_subdirectory(cafProjectDataModel)
-add_subdirectory(CommonCode)
-add_subdirectory(cafAnimControl)
-add_subdirectory(cafViewer)
-add_subdirectory(cafUserInterface)
-add_subdirectory(cafPdmCvf)
+add_subdirectory(Fwk/AppFwk/cafProjectDataModel)
+add_subdirectory(Fwk/AppFwk/CommonCode)
+add_subdirectory(Fwk/AppFwk/cafAnimControl)
+add_subdirectory(Fwk/AppFwk/cafViewer)
+add_subdirectory(Fwk/AppFwk/cafUserInterface)
+add_subdirectory(Fwk/AppFwk/cafPdmCvf)
 
 include_directories(
     ${cafUserInterface_SOURCE_DIR}