From 2b5bea7a4a2350f172c42ad25ef571f967f5cda9 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetron.com>
Date: Tue, 26 Feb 2013 09:38:33 +0100
Subject: [PATCH] Cleaned up and improved how files are included from
 CMakeLists_files.cmake p4#: 20616

---
 .../FileInterface_UnitTests/CMakeLists.txt    | 65 +++++++------------
 1 file changed, 25 insertions(+), 40 deletions(-)

diff --git a/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt b/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt
index 9c3864f00f..33a34260a3 100644
--- a/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt
+++ b/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt
@@ -20,33 +20,34 @@ include_directories(
     ${ResInsight_SOURCE_DIR}/CommonCode
 )
 
+
+# Populate variables from read from CMakeLists_files.cmake
+set (CODE_SOURCE_FILES )
 include ("${ResInsight_SOURCE_DIR}/ApplicationCode/FileInterface/CMakeLists_files.cmake")
-set( FILEINTERFACE_CPP_SOURCES
+set( CPP_SOURCES
+    ${CPP_SOURCES}
     ${CODE_SOURCE_FILES}
 )
+source_group( "FileInterface"       FILES ${CODE_SOURCE_FILES} )
 
-set( RESERVOIRDATAMODEL_CPP_SOURCES
-    ${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigCell.cpp
-    ${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigGridBase.cpp
-    ${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigLocalGrid.cpp
-    ${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
-    ${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigEclipseCase.cpp
-    ${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
-    ${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigReservoirCellResults.cpp
-    ${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigWellResults.cpp
-    ${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp
-    ${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/RigActiveCellInfo.cpp
+
+# Populate variables from read from CMakeLists_files.cmake
+set (CODE_SOURCE_FILES )
+include ("${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake")
+set( CPP_SOURCES
+    ${CPP_SOURCES}
+    ${CODE_SOURCE_FILES}
+)
+source_group( "ReservoirDataModel"       FILES ${CODE_SOURCE_FILES} )
+
+
+set( CPP_SOURCES
+    ${CPP_SOURCES}
 
     ${ResInsight_SOURCE_DIR}/cafUserInterface/cafProgressInfo.cpp
 )
 
-set( CPP_SOURCES
-    ${FILEINTERFACE_CPP_SOURCES}
-    ${RESERVOIRDATAMODEL_CPP_SOURCES}
-)
-
-source_group( "FileInterface"       FILES ${FILEINTERFACE_CPP_SOURCES} )
-source_group( "ReservoirDataModel"  FILES ${RESERVOIRDATAMODEL_CPP_SOURCES} )
+source_group( "Headers"             FILES ${CODE_HEADER_FILES} )
 
 set( UNIT_TEST_CPP_SOURCES
     main.cpp
@@ -54,7 +55,6 @@ set( UNIT_TEST_CPP_SOURCES
     Ert-Test.cpp
 )
 
-
 set( LINK_LIBRARIES
     CommonCode
 
@@ -71,20 +71,22 @@ set( LINK_LIBRARIES
     ${QT_LIBRARIES}
 )
 
-
-
 add_executable( ${ProjectName}
+    ${CODE_HEADER_FILES}
+
     ${CPP_SOURCES}
     ${UNIT_TEST_CPP_SOURCES}
 
     ${ResInsight_SOURCE_DIR}/ThirdParty/gtest/gtest-all.cc
+
+    ${ResInsight_SOURCE_DIR}/ApplicationCode/FileInterface/CMakeLists_files.cmake
+    ${ResInsight_SOURCE_DIR}/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
 )
 
 set( EXTERNAL_LINK_LIBRARIES ${ERT_LIBRARY_LIST} )
 target_link_libraries( ${ProjectName} ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES})
 
 
-
 # Copy Dlls
 if (MSVC)
 
@@ -97,21 +99,4 @@ if (MSVC)
                 ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>)
     endforeach( qtlib )
 
-
-    # DLLs ERT depends on
-#    add_custom_command(TARGET ${ProjectName} POST_BUILD
-#        COMMAND ${CMAKE_COMMAND} -E copy_directory
-#            "${PROJECT_SOURCE_DIR}/../../../ThirdParty/Ert-windows/bin/"
-#            ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>)
-
-
-     # ERT DLLs
- #    set (ERT_MODULES ecl geometry util well)
- #    foreach (ert_module ${ERT_MODULES})
- #        add_custom_command(TARGET ${ProjectName} POST_BUILD
- #            COMMAND ${CMAKE_COMMAND} -E copy_if_different
- #                "${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert-windows/${ert_module}/lib/lib${ert_module}.dll"
- #                ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>)
- #    endforeach()
-
 endif(MSVC)