#2423 Export Completions : Move files to separate folder

ApplicationCode/CMakeLists.txt

@@ -117,6 +117,7 @@ list( APPEND REFERENCED_CMAKE_FILES
     Commands/CMakeLists_files.cmake
     Commands/ApplicationCommands/CMakeLists_files.cmake
     Commands/CompletionCommands/CMakeLists_files.cmake
+    Commands/CompletionCommands/CompletionExportCommands/CMakeLists_files.cmake
     Commands/CrossSectionCommands/CMakeLists_files.cmake
     Commands/EclipseCommands/CMakeLists_files.cmake
     Commands/EclipseCommands/EclipseWell/CMakeLists_files.cmake

ApplicationCode/Commands/CompletionCommands/CMakeLists_files.cmake

@@ -7,48 +7,29 @@ endif()
 set (SOURCE_GROUP_HEADER_FILES
 ${CEE_CURRENT_LIST_DIR}RicCaseAndFileExportSettingsUi.h
 ${CEE_CURRENT_LIST_DIR}RicEditPerforationCollectionFeature.h
-${CEE_CURRENT_LIST_DIR}RicExportCompletionDataSettingsUi.h
 ${CEE_CURRENT_LIST_DIR}RicExportFishbonesLateralsFeature.h
 ${CEE_CURRENT_LIST_DIR}RicExportFishbonesWellSegmentsFeature.h
 ${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsAtMeasuredDepthFeature.h
 ${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsFeature.h
 ${CEE_CURRENT_LIST_DIR}RicNewPerforationIntervalFeature.h
 ${CEE_CURRENT_LIST_DIR}RicNewPerforationIntervalAtMeasuredDepthFeature.h
-${CEE_CURRENT_LIST_DIR}RicWellPathExportCompletionDataFeature.h
 ${CEE_CURRENT_LIST_DIR}RicWellPathImportCompletionsFileFeature.h
 ${CEE_CURRENT_LIST_DIR}RicWellPathImportPerforationIntervalsFeature.h
-${CEE_CURRENT_LIST_DIR}RicFishbonesTransmissibilityCalculationFeatureImp.h
 )
 
-if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
-    list (APPEND SOURCE_GROUP_HEADER_FILES
-        ${CEE_CURRENT_LIST_DIR}RicExportFractureCompletionsImpl.h
-    )
-endif()
-
-
 set (SOURCE_GROUP_SOURCE_FILES
 ${CEE_CURRENT_LIST_DIR}RicCaseAndFileExportSettingsUi.cpp
 ${CEE_CURRENT_LIST_DIR}RicEditPerforationCollectionFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicExportCompletionDataSettingsUi.cpp
 ${CEE_CURRENT_LIST_DIR}RicExportFishbonesLateralsFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicExportFishbonesWellSegmentsFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsAtMeasuredDepthFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicNewPerforationIntervalFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicNewPerforationIntervalAtMeasuredDepthFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicWellPathExportCompletionDataFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicWellPathImportCompletionsFileFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicWellPathImportPerforationIntervalsFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicFishbonesTransmissibilityCalculationFeatureImp.cpp
 )
 
-if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
-    list (APPEND SOURCE_GROUP_SOURCE_FILES
-        ${CEE_CURRENT_LIST_DIR}RicExportFractureCompletionsImpl.cpp
-    )
-endif()
-
 
 list(APPEND CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}

ApplicationCode/Commands/CompletionCommands/CompletionExportCommands/CMakeLists_files.cmake

@@ -0,0 +1,41 @@
+
+# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly 
+if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
+    set(CEE_CURRENT_LIST_DIR  ${CMAKE_CURRENT_LIST_DIR}/)
+endif()
+
+set (SOURCE_GROUP_HEADER_FILES
+${CEE_CURRENT_LIST_DIR}RicExportCompletionDataSettingsUi.h
+${CEE_CURRENT_LIST_DIR}RicWellPathExportCompletionDataFeature.h
+${CEE_CURRENT_LIST_DIR}RicFishbonesTransmissibilityCalculationFeatureImp.h
+)
+
+if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
+    list (APPEND SOURCE_GROUP_HEADER_FILES
+        ${CEE_CURRENT_LIST_DIR}RicExportFractureCompletionsImpl.h
+    )
+endif()
+
+
+set (SOURCE_GROUP_SOURCE_FILES
+${CEE_CURRENT_LIST_DIR}RicExportCompletionDataSettingsUi.cpp
+${CEE_CURRENT_LIST_DIR}RicWellPathExportCompletionDataFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicFishbonesTransmissibilityCalculationFeatureImp.cpp
+)
+
+if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
+    list (APPEND SOURCE_GROUP_SOURCE_FILES
+        ${CEE_CURRENT_LIST_DIR}RicExportFractureCompletionsImpl.cpp
+    )
+endif()
+
+
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
+
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+source_group( "CommandFeature\\CompletionExport" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )

ApplicationCode/Commands/CompletionCommands/CompletionExportCommands/RicExportCompletionDataSettingsUi.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "RicCaseAndFileExportSettingsUi.h"
+#include "../RicCaseAndFileExportSettingsUi.h"
 
 #include "cafPdmField.h"
 #include "cafAppEnum.h"