Merge pull request #8201 from OPM/move_intersections

Move intersection related files into subfolder

ApplicationLibCode/CMakeLists.txt

@@ -115,6 +115,7 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/StimPlanModel
   ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Summary
   ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Surfaces
+  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Intersections
   ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Streamlines
   ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/CellFilters
   ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/ProcessControl
@@ -189,6 +190,7 @@ list(
   ProjectDataModel/StimPlanModel/CMakeLists_files.cmake
   ProjectDataModel/Streamlines/CMakeLists_files.cmake
   ProjectDataModel/Surfaces/CMakeLists_files.cmake
+  ProjectDataModel/Intersections/CMakeLists_files.cmake
   ProjectDataModel/CellFilters/CMakeLists_files.cmake
   ProjectDataModel/ProcessControl/CMakeLists_files.cmake
   ProjectDataModel/WellLog/CMakeLists_files.cmake
@@ -295,7 +297,8 @@ endif()
 
 set(QT_MOC_HEADERS
     ${QT_MOC_HEADERS} ProjectDataModel/RimMimeData.h
-    ProjectDataModel/RimBoxIntersection.h SocketInterface/RiaSocketServer.h
+    ProjectDataModel/Intersections/RimBoxIntersection.h
+    SocketInterface/RiaSocketServer.h
 )
 
 qt5_wrap_cpp(MOC_SOURCE_FILES ${QT_MOC_HEADERS})
@@ -433,6 +436,7 @@ target_include_directories(
          ${CMAKE_SOURCE_DIR}/ApplicationLibCode/ModelVisualization
          ${CMAKE_SOURCE_DIR}/ApplicationLibCode/ProjectDataModel
          ${CMAKE_SOURCE_DIR}/ApplicationLibCode/ProjectDataModel/Flow
+         ${CMAKE_SOURCE_DIR}/ApplicationLibCode/ProjectDataModel/Intersections
          ${CMAKE_SOURCE_DIR}/ApplicationLibCode/ReservoirDataModel
          ${CMAKE_SOURCE_DIR}/ApplicationLibCode/SocketInterface
          ${CMAKE_SOURCE_DIR}/ApplicationLibCode/UserInterface

ApplicationLibCode/ProjectDataModel/CMakeLists_files.cmake

@@ -59,17 +59,11 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimWbsParameters.h
     ${CMAKE_CURRENT_LIST_DIR}/RimViewLinker.h
     ${CMAKE_CURRENT_LIST_DIR}/RimViewLinkerCollection.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimIntersection.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimExtrudedCurveIntersection.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionCollection.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionResultDefinition.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionResultsDefinitionCollection.h
     ${CMAKE_CURRENT_LIST_DIR}/RimContextCommandBuilder.h
     ${CMAKE_CURRENT_LIST_DIR}/RimGridCollection.h
     ${CMAKE_CURRENT_LIST_DIR}/RimPlotCurve.h
     ${CMAKE_CURRENT_LIST_DIR}/RimPlotCurveAppearance.h
     ${CMAKE_CURRENT_LIST_DIR}/RimStackablePlotCurve.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimBoxIntersection.h
     ${CMAKE_CURRENT_LIST_DIR}/RimAdvancedSnapshotExportDefinition.h
     ${CMAKE_CURRENT_LIST_DIR}/RimMdiWindowController.h
     ${CMAKE_CURRENT_LIST_DIR}/RimNamedObject.h
@@ -186,17 +180,11 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimWbsParameters.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimViewLinker.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimViewLinkerCollection.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimIntersection.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimExtrudedCurveIntersection.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionCollection.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionResultDefinition.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionResultsDefinitionCollection.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimContextCommandBuilder.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimGridCollection.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimPlotCurve.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimPlotCurveAppearance.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimStackablePlotCurve.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimBoxIntersection.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimAdvancedSnapshotExportDefinition.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimMdiWindowController.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimNamedObject.cpp

ApplicationLibCode/ProjectDataModel/Intersections/CMakeLists_files.cmake

@@ -0,0 +1,27 @@
+set(SOURCE_GROUP_HEADER_FILES
+    ${CMAKE_CURRENT_LIST_DIR}/RimBoxIntersection.h
+    ${CMAKE_CURRENT_LIST_DIR}/RimIntersection.h
+    ${CMAKE_CURRENT_LIST_DIR}/RimExtrudedCurveIntersection.h
+    ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionCollection.h
+    ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionResultDefinition.h
+    ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionResultsDefinitionCollection.h
+)
+
+set(SOURCE_GROUP_SOURCE_FILES
+    ${CMAKE_CURRENT_LIST_DIR}/RimIntersection.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RimExtrudedCurveIntersection.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionCollection.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionResultDefinition.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionResultsDefinitionCollection.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RimBoxIntersection.cpp
+)
+
+list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
+
+list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
+
+source_group(
+  "ProjectDataModel\\Intersection"
+  FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)