System : Moved files to Commands/EclipseCommands

ApplicationCode/CMakeLists.txt

@@ -38,6 +38,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/Adm
     ${CMAKE_CURRENT_SOURCE_DIR}/Application
     ${CMAKE_CURRENT_SOURCE_DIR}/Commands
+    ${CMAKE_CURRENT_SOURCE_DIR}/Commands/EclipseCommands
     ${CMAKE_CURRENT_SOURCE_DIR}/FileInterface
     ${CMAKE_CURRENT_SOURCE_DIR}/SocketInterface
     ${CMAKE_CURRENT_SOURCE_DIR}/ModelVisualization
@@ -105,16 +106,17 @@ list( APPEND REFERENCED_CMAKE_FILES
     UserInterface/CMakeLists_files.cmake
 	
     Commands/CMakeLists_files.cmake
-	Commands/OperationsUsingObjReferences/CMakeLists_files.cmake
-    Commands/ToggleCommands/CMakeLists_files.cmake
+    Commands/ApplicationCommands/CMakeLists_files.cmake
+    Commands/CrossSectionCommands/CMakeLists_files.cmake
+    Commands/EclipseCommands/CMakeLists_files.cmake
+    Commands/IntersectionBoxCommands/CMakeLists_files.cmake
     Commands/OctaveScriptCommands/CMakeLists_files.cmake
+	Commands/OperationsUsingObjReferences/CMakeLists_files.cmake
+    Commands/SummaryPlotCommands/CMakeLists_files.cmake
+    Commands/ToggleCommands/CMakeLists_files.cmake
     Commands/ViewLink/CMakeLists_files.cmake
     Commands/WellLogCommands/CMakeLists_files.cmake
-    Commands/SummaryPlotCommands/CMakeLists_files.cmake
     Commands/WellPathCommands/CMakeLists_files.cmake
-    Commands/CrossSectionCommands/CMakeLists_files.cmake
-    Commands/IntersectionBoxCommands/CMakeLists_files.cmake
-    Commands/ApplicationCommands/CMakeLists_files.cmake
 )
 
 option (RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS "Include ApplicationCode Unit Tests" OFF)

ApplicationCode/Commands/CMakeLists_files.cmake

@@ -6,18 +6,11 @@ endif()
 
 set (SOURCE_GROUP_HEADER_FILES
 ${CEE_CURRENT_LIST_DIR}RicCloseCaseFeature.h
-${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupFeature.h
-${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupExec.h
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterFeatureImpl.h
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsertFeature.h
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsertExec.h
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewFeature.h
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewExec.h
-${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterFeatureImpl.h
-${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertFeature.h
-${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertExec.h
-${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewFeature.h
-${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewExec.h
 ${CEE_CURRENT_LIST_DIR}RicNewViewFeature.h
 ${CEE_CURRENT_LIST_DIR}RicPropertyFilterNewExec.h
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterExecImpl.h
@@ -29,27 +22,15 @@ ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewExec.h
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceIFeature.h
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceJFeature.h
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceKFeature.h
-${CEE_CURRENT_LIST_DIR}RicAddEclipseInputPropertyFeature.h
-${CEE_CURRENT_LIST_DIR}RicSaveEclipseInputPropertyFeature.h
-${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyFeature.h
-${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.h
-${CEE_CURRENT_LIST_DIR}RicImportEclipseCaseFeature.h
-${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseFeature.h
 ${CEE_CURRENT_LIST_DIR}RicImportFormationNamesFeature.h
 ${CEE_CURRENT_LIST_DIR}RicReloadFormationNamesFeature.h
 
-${CEE_CURRENT_LIST_DIR}RicCreateGridCaseGroupFeature.h
-${CEE_CURRENT_LIST_DIR}RicNewStatisticsCaseFeature.h
-${CEE_CURRENT_LIST_DIR}RicComputeStatisticsFeature.h
-
 ${CEE_CURRENT_LIST_DIR}RicWellLogsImportFileFeature.h
 
 ${CEE_CURRENT_LIST_DIR}RicTogglePerspectiveViewFeature.h
 ${CEE_CURRENT_LIST_DIR}RicExportToLasFileFeature.h
 ${CEE_CURRENT_LIST_DIR}RicExportToLasFileResampleUi.h
-${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseOpmFeature.h
 ${CEE_CURRENT_LIST_DIR}RicSnapshotViewToClipboardFeature.h
-${CEE_CURRENT_LIST_DIR}RicAddOpmInputPropertyFeature.h
 ${CEE_CURRENT_LIST_DIR}RicImportGeoMechCaseFeature.h
 ${CEE_CURRENT_LIST_DIR}RicImportSummaryCaseFeature.h
 
@@ -63,18 +44,11 @@ ${CEE_CURRENT_LIST_DIR}RicCommandFeature.h
 
 set (SOURCE_GROUP_SOURCE_FILES
 ${CEE_CURRENT_LIST_DIR}RicCloseCaseFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupExec.cpp
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterFeatureImpl.cpp
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsertFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsertExec.cpp
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewExec.cpp
-${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterFeatureImpl.cpp
-${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertExec.cpp
-${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewExec.cpp
 ${CEE_CURRENT_LIST_DIR}RicNewViewFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterExecImpl.cpp
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterInsertExec.cpp
@@ -85,25 +59,13 @@ ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewExec.cpp
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceIFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceJFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceKFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicAddEclipseInputPropertyFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicSaveEclipseInputPropertyFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.cpp
-${CEE_CURRENT_LIST_DIR}RicImportEclipseCaseFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicImportFormationNamesFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicReloadFormationNamesFeature.cpp
 
-${CEE_CURRENT_LIST_DIR}RicCreateGridCaseGroupFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicNewStatisticsCaseFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicComputeStatisticsFeature.cpp
-
 ${CEE_CURRENT_LIST_DIR}RicTogglePerspectiveViewFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicExportToLasFileFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicExportToLasFileResampleUi.cpp
-${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseOpmFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicSnapshotViewToClipboardFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicAddOpmInputPropertyFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicImportGeoMechCaseFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicImportSummaryCaseFeature.cpp
 

ApplicationCode/Commands/EclipseCommands/CMakeLists_files.cmake

@@ -0,0 +1,57 @@
+
+# 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}RicAddEclipseInputPropertyFeature.h
+${CEE_CURRENT_LIST_DIR}RicAddOpmInputPropertyFeature.h
+${CEE_CURRENT_LIST_DIR}RicComputeStatisticsFeature.h
+${CEE_CURRENT_LIST_DIR}RicCreateGridCaseGroupFeature.h
+${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupExec.h
+${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupFeature.h
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterFeatureImpl.h
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertExec.h
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertFeature.h
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewExec.h
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewFeature.h
+${CEE_CURRENT_LIST_DIR}RicImportEclipseCaseFeature.h
+${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseFeature.h
+${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseOpmFeature.h
+${CEE_CURRENT_LIST_DIR}RicNewStatisticsCaseFeature.h
+${CEE_CURRENT_LIST_DIR}RicSaveEclipseInputPropertyFeature.h
+${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.h
+${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyFeature.h
+)
+
+set (SOURCE_GROUP_SOURCE_FILES
+${CEE_CURRENT_LIST_DIR}RicAddEclipseInputPropertyFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicAddOpmInputPropertyFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicComputeStatisticsFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicCreateGridCaseGroupFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupExec.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterFeatureImpl.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertExec.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewExec.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicImportEclipseCaseFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseOpmFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicNewStatisticsCaseFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicSaveEclipseInputPropertyFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.cpp
+${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyFeature.cpp
+)
+
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
+
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+source_group( "CommandFeature\\Eclipse" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )