#1596 Move several files from Application to Application/Tools

ApplicationCode/Application/CMakeLists_files.cmake

@@ -0,0 +1,32 @@
+
+# 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}RiaApplication.h
+${CEE_CURRENT_LIST_DIR}RiaPreferences.h
+)
+
+set (SOURCE_GROUP_SOURCE_FILES
+${CEE_CURRENT_LIST_DIR}RiaApplication.cpp
+${CEE_CURRENT_LIST_DIR}RiaMain.cpp
+${CEE_CURRENT_LIST_DIR}RiaPreferences.cpp
+)
+
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
+
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+set (QT_MOC_HEADERS
+${QT_MOC_HEADERS}
+${CEE_CURRENT_LIST_DIR}RiaApplication.h
+)
+
+
+source_group( "Application" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )

ApplicationCode/Application/Tools/CMakeLists_files.cmake

@@ -0,0 +1,39 @@
+
+# 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}RiaColorTables.h
+${CEE_CURRENT_LIST_DIR}RiaImageCompareReporter.h
+${CEE_CURRENT_LIST_DIR}RiaImageFileCompare.h
+${CEE_CURRENT_LIST_DIR}RiaLogging.h
+${CEE_CURRENT_LIST_DIR}RiaProjectModifier.h
+${CEE_CURRENT_LIST_DIR}RiaRegressionTest.h
+)
+
+set (SOURCE_GROUP_SOURCE_FILES
+${CEE_CURRENT_LIST_DIR}RiaColorTables.cpp
+${CEE_CURRENT_LIST_DIR}RiaImageCompareReporter.cpp
+${CEE_CURRENT_LIST_DIR}RiaImageFileCompare.cpp
+${CEE_CURRENT_LIST_DIR}RiaLogging.cpp
+${CEE_CURRENT_LIST_DIR}RiaProjectModifier.cpp
+${CEE_CURRENT_LIST_DIR}RiaRegressionTest.cpp
+)
+
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
+
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+set (QT_MOC_HEADERS
+${QT_MOC_HEADERS}
+)
+
+
+source_group( "Application\\Tools" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )

ApplicationCode/CMakeLists.txt

@@ -37,6 +37,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/Adm
     ${CMAKE_CURRENT_SOURCE_DIR}/Application
+    ${CMAKE_CURRENT_SOURCE_DIR}/Application/Tools
     ${CMAKE_CURRENT_SOURCE_DIR}/Commands
     ${CMAKE_CURRENT_SOURCE_DIR}/Commands/EclipseCommands
     ${CMAKE_CURRENT_SOURCE_DIR}/FileInterface
@@ -69,20 +70,6 @@ include_directories(
 # Use all h files in the subdirectories to make them available in the project
 file( GLOB_RECURSE HEADER_FILES *.h )
 
-set( APPLICATION_FILES 
-    RiaMain.cpp
-        
-    Application/RiaApplication.cpp
-    Application/RiaPreferences.cpp
-    Application/RiaImageFileCompare.cpp
-    Application/RiaImageCompareReporter.cpp
-    Application/RiaProjectModifier.cpp
-    Application/RiaRegressionTest.cpp
-    Application/RiaColorTables.cpp
-    Application/RiaLogging.h
-    Application/RiaLogging.cpp
-)
-
 set( SOCKET_INTERFACE_FILES
     SocketInterface/RiaSocketServer.cpp
     SocketInterface/RiaProjectInfoCommands.cpp
@@ -95,12 +82,14 @@ set( SOCKET_INTERFACE_FILES
 )
 
 list( APPEND CPP_SOURCES
-     ${APPLICATION_FILES}
      ${SOCKET_INTERFACE_FILES}
      ${UNIT_TEST_FILES}
 )
 
 list( APPEND REFERENCED_CMAKE_FILES
+    Application/CMakeLists_files.cmake
+    Application/Tools/CMakeLists_files.cmake
+
     ReservoirDataModel/CMakeLists_files.cmake
     ReservoirDataModel/CMakeLists_filesNotToUnitTest.cmake
     FileInterface/CMakeLists_files.cmake
@@ -185,7 +174,6 @@ add_subdirectory(GeoMech/GeoMechDataModel)
 
 set ( QT_MOC_HEADERS
     ${QT_MOC_HEADERS}
-    Application/RiaApplication.h
     
     ProjectDataModel/RimMimeData.h
     ProjectDataModel/RimIntersectionBox.h
@@ -221,7 +209,6 @@ endif()
 ################################################################################
 # Create source groups - see also included CMakeLists_files.cmake
 ################################################################################
-source_group( "Application"         FILES ${APPLICATION_FILES} )
 source_group( "ModelVisualization"  FILES ${MODEL_VISUALIZATION_FILES} )
 source_group( "SocketInterface"     FILES ${SOCKET_INTERFACE_FILES} )
 source_group( "UnitTests"           FILES ${UNIT_TEST_FILES} )