Added source groups in CMake to improve file organization in generated projects

p4#: 21330

ApplicationCode/CMakeLists.txt

@@ -27,27 +27,31 @@ include_directories(
 # Use all h files in the subdirectories to make them available in the project
 file( GLOB_RECURSE HEADER_FILES *.h )
 
-list( APPEND CPP_SOURCES
+set( APPLICATION_FILES 
     RiaMain.cpp
     RiaStdInclude.cpp
-)
         
-list( APPEND CPP_SOURCES
     Application/RiaApplication.cpp
     Application/RiaPreferences.cpp
 	Application/RiaImageFileCompare.cpp
 	Application/RiaImageCompareReporter.cpp
 )
 
+set( USER_INTERFACE_FILES
+    UserInterface/RiuCursors.cpp
+    UserInterface/RiuMainWindow.cpp
+    UserInterface/RiuPreferencesDialog.cpp
+    UserInterface/RiuResultInfoPanel.cpp
+    UserInterface/RiuViewer.cpp
+    UserInterface/RiuSimpleHistogramWidget.cpp
+	UserInterface/RiuMultiCaseImportDialog.cpp
+    UserInterface/RiuProcessMonitor.cpp
+)
+
+
 list( APPEND CPP_SOURCES
-    ModelVisualization/RivCellEdgeEffectGenerator.cpp
+     ${APPLICATION_FILES}
-    ModelVisualization/RivGridPartMgr.cpp
+     ${USER_INTERFACE_FILES}
-    ModelVisualization/RivReservoirPartMgr.cpp
-    ModelVisualization/RivReservoirViewPartMgr.cpp
-    ModelVisualization/RivPipeGeometryGenerator.cpp
-    ModelVisualization/RivReservoirPipesPartMgr.cpp
-    ModelVisualization/RivWellPipesPartMgr.cpp
-    ModelVisualization/RivWellHeadPartMgr.cpp
 )
 
 list( APPEND CPP_SOURCES
@@ -59,6 +63,7 @@ list( APPEND REFERENCED_CMAKE_FILES
     ReservoirDataModel/CMakeLists_files.cmake
     FileInterface/CMakeLists_files.cmake
     ProjectDataModel/CMakeLists_files.cmake
+    ModelVisualization/CMakeLists_files.cmake
 )
 
 # Include source file lists from *.cmake files
@@ -66,22 +71,10 @@ foreach (referencedfile ${REFERENCED_CMAKE_FILES})
     include (${referencedfile})
 endforeach (referencedfile)
 
-
 list( APPEND CPP_SOURCES
     ${CODE_SOURCE_FILES}
 )
 
-list( APPEND CPP_SOURCES
-    UserInterface/RiuCursors.cpp
-    UserInterface/RiuMainWindow.cpp
-    UserInterface/RiuPreferencesDialog.cpp
-    UserInterface/RiuResultInfoPanel.cpp
-    UserInterface/RiuViewer.cpp
-    UserInterface/RiuSimpleHistogramWidget.cpp
-	UserInterface/RiuMultiCaseImportDialog.cpp
-    UserInterface/RiuProcessMonitor.cpp
-
-)
 
 # Define files for MOC-ing
 set ( QT_MOC_HEADERS
@@ -179,8 +172,13 @@ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 precompiled_header( RAW_SOURCES ALL_INCLUDES ${GCC_PCH_TARGET} ${PCH_NAME} ${PCH_COMPILER_DEFINE} )
 
-################################################################################
 
+################################################################################
+# Create source groups - see also included CMakeLists_files.cmake
+################################################################################
+source_group( "Application"         FILES ${APPLICATION_FILES} )
+source_group( "ModelVisualization"  FILES ${MODEL_VISUALIZATION_FILES} )
+source_group( "UserInterface"       FILES ${USER_INTERFACE_FILES} )
 
 
 add_executable(ResInsight

ApplicationCode/FileInterface/CMakeLists_files.cmake

@@ -4,8 +4,7 @@ if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
     set(CEE_CURRENT_LIST_DIR  ${CMAKE_CURRENT_LIST_DIR}/)
 endif()
 
-
+set (SOURCE_GROUP_HEADER_FILES
-list(APPEND CODE_HEADER_FILES
 ${CEE_CURRENT_LIST_DIR}RifEclipseInputFileTools.h
 ${CEE_CURRENT_LIST_DIR}RifEclipseOutputFileTools.h
 ${CEE_CURRENT_LIST_DIR}RifEclipseRestartDataAccess.h
@@ -17,7 +16,7 @@ ${CEE_CURRENT_LIST_DIR}RifReaderInterface.h
 ${CEE_CURRENT_LIST_DIR}RifReaderMockModel.h
 )
 
-list(APPEND CODE_SOURCE_FILES
+set (SOURCE_GROUP_SOURCE_FILES
 ${CEE_CURRENT_LIST_DIR}RifEclipseInputFileTools.cpp
 ${CEE_CURRENT_LIST_DIR}RifEclipseOutputFileTools.cpp
 ${CEE_CURRENT_LIST_DIR}RifEclipseRestartDataAccess.cpp
@@ -28,4 +27,12 @@ ${CEE_CURRENT_LIST_DIR}RifReaderEclipseOutput.cpp
 ${CEE_CURRENT_LIST_DIR}RifReaderMockModel.cpp
 )
 
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
 
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+source_group( "FileInterface" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} )

ApplicationCode/ModelVisualization/CMakeLists_files.cmake

@@ -0,0 +1,37 @@
+
+# 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}RivCellEdgeEffectGenerator.h
+${CEE_CURRENT_LIST_DIR}RivGridPartMgr.h
+${CEE_CURRENT_LIST_DIR}RivReservoirPartMgr.h
+${CEE_CURRENT_LIST_DIR}RivReservoirViewPartMgr.h
+${CEE_CURRENT_LIST_DIR}RivPipeGeometryGenerator.h
+${CEE_CURRENT_LIST_DIR}RivReservoirPipesPartMgr.h
+${CEE_CURRENT_LIST_DIR}RivWellPipesPartMgr.h
+${CEE_CURRENT_LIST_DIR}RivWellHeadPartMgr.h
+)
+
+set (SOURCE_GROUP_SOURCE_FILES
+${CEE_CURRENT_LIST_DIR}RivCellEdgeEffectGenerator.cpp
+${CEE_CURRENT_LIST_DIR}RivGridPartMgr.cpp
+${CEE_CURRENT_LIST_DIR}RivReservoirPartMgr.cpp
+${CEE_CURRENT_LIST_DIR}RivReservoirViewPartMgr.cpp
+${CEE_CURRENT_LIST_DIR}RivPipeGeometryGenerator.cpp
+${CEE_CURRENT_LIST_DIR}RivReservoirPipesPartMgr.cpp
+${CEE_CURRENT_LIST_DIR}RivWellPipesPartMgr.cpp
+${CEE_CURRENT_LIST_DIR}RivWellHeadPartMgr.cpp
+)
+
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
+
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+source_group( "ModelVisualization" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} )

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -4,8 +4,7 @@ if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
     set(CEE_CURRENT_LIST_DIR  ${CMAKE_CURRENT_LIST_DIR}/)
 endif()
 
-
+set (SOURCE_GROUP_HEADER_FILES
-list(APPEND CODE_HEADER_FILES
 ${CEE_CURRENT_LIST_DIR}RimCaseCollection.h
 ${CEE_CURRENT_LIST_DIR}RimCellFilter.h
 ${CEE_CURRENT_LIST_DIR}RimCellPropertyFilter.h
@@ -41,7 +40,7 @@ ${CEE_CURRENT_LIST_DIR}RimStatisticsCaseEvaluator.h
 ${CEE_CURRENT_LIST_DIR}RimMimeData.h
 )
 
-list(APPEND CODE_SOURCE_FILES
+set (SOURCE_GROUP_SOURCE_FILES
 ${CEE_CURRENT_LIST_DIR}RimCaseCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimCellFilter.cpp
 ${CEE_CURRENT_LIST_DIR}RimCellPropertyFilter.cpp
@@ -77,4 +76,12 @@ ${CEE_CURRENT_LIST_DIR}RimStatisticsCaseEvaluator.cpp
 ${CEE_CURRENT_LIST_DIR}RimMimeData.cpp
 )
 
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
 
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+source_group( "ProjectDataModel" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} )

ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake

@@ -4,8 +4,7 @@ if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
     set(CEE_CURRENT_LIST_DIR  ${CMAKE_CURRENT_LIST_DIR}/)
 endif()
 
-
+set (SOURCE_GROUP_HEADER_FILES
-list(APPEND CODE_HEADER_FILES
 ${CEE_CURRENT_LIST_DIR}RigActiveCellInfo.h
 ${CEE_CURRENT_LIST_DIR}RigCell.h
 ${CEE_CURRENT_LIST_DIR}RigCaseData.h
@@ -18,10 +17,9 @@ ${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.h
 ${CEE_CURRENT_LIST_DIR}RigCaseCellResultsData.h
 ${CEE_CURRENT_LIST_DIR}RigSingleWellResultsData.h
 ${CEE_CURRENT_LIST_DIR}RigStatisticsMath.h
-
 )
 
-list(APPEND CODE_SOURCE_FILES
+set (SOURCE_GROUP_SOURCE_FILES
 ${CEE_CURRENT_LIST_DIR}RigActiveCellInfo.cpp
 ${CEE_CURRENT_LIST_DIR}RigCell.cpp
 ${CEE_CURRENT_LIST_DIR}RigCaseData.cpp
@@ -36,4 +34,12 @@ ${CEE_CURRENT_LIST_DIR}RigSingleWellResultsData.cpp
 ${CEE_CURRENT_LIST_DIR}RigStatisticsMath.cpp
 )
 
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
 
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+source_group( "ReservoirDataModel" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} )