From c0cac1c8243d363da22e06cb0309d05b01c7e02e Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Wed, 22 Jun 2016 14:38:22 +0200
Subject: [PATCH] [FileIO] Move FEFLOWInterface to FileIO.
---
Applications/DataExplorer/mainwindow.cpp | 4 ++--
Applications/FileIO/CMakeLists.txt | 5 +++++
.../IO => Applications/FileIO}/FEFLOW/FEFLOWGeoInterface.cpp | 0
.../IO => Applications/FileIO}/FEFLOW/FEFLOWGeoInterface.h | 0
.../FileIO}/FEFLOW/FEFLOWMeshInterface.cpp | 2 +-
.../IO => Applications/FileIO}/FEFLOW/FEFLOWMeshInterface.h | 0
Applications/Utils/FileConverter/CMakeLists.txt | 2 +-
Applications/Utils/FileConverter/FEFLOW2OGS.cpp | 2 +-
GeoLib/CMakeLists.txt | 2 --
MeshLib/CMakeLists.txt | 5 -----
10 files changed, 10 insertions(+), 12 deletions(-)
rename {GeoLib/IO => Applications/FileIO}/FEFLOW/FEFLOWGeoInterface.cpp (100%)
rename {GeoLib/IO => Applications/FileIO}/FEFLOW/FEFLOWGeoInterface.h (100%)
rename {MeshLib/IO => Applications/FileIO}/FEFLOW/FEFLOWMeshInterface.cpp (99%)
rename {MeshLib/IO => Applications/FileIO}/FEFLOW/FEFLOWMeshInterface.h (100%)
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index 4200dff96de..4d3698e56b2 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -61,7 +61,7 @@
// FileIO includes
#include "GMSInterface.h"
-#include "MeshLib/IO/FEFLOW/FEFLOWMeshInterface.h"
+#include "Applications/FileIO/FEFLOW/FEFLOWMeshInterface.h"
#include "MeshLib/IO/Legacy/MeshIO.h"
#include "MeshLib/IO/readMeshFromFile.h"
#include "MeshLib/IO/GmshReader.h"
@@ -69,7 +69,7 @@
#include "PetrelInterface.h"
#include "XmlIO/Qt/XmlGspInterface.h"
#include "GeoLib/IO/GMSHInterface.h"
-#include "GeoLib/IO/FEFLOW/FEFLOWGeoInterface.h"
+#include "Applications/FileIO/FEFLOW/FEFLOWGeoInterface.h"
#include "GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h"
#include "GeoLib/IO/XmlIO/Qt/XmlStnInterface.h"
diff --git a/Applications/FileIO/CMakeLists.txt b/Applications/FileIO/CMakeLists.txt
index d4ae93cbf6d..2d39952053a 100644
--- a/Applications/FileIO/CMakeLists.txt
+++ b/Applications/FileIO/CMakeLists.txt
@@ -14,6 +14,11 @@ endif()
GET_SOURCE_FILES(SOURCES_RAPID_XML XmlIO/Rapid)
set(SOURCES ${SOURCES} ${SOURCES_RAPID_XML})
+if(QT4_FOUND)
+ GET_SOURCE_FILES(SOURCES_FEFLOW FEFLOW)
+ SET(SOURCES ${SOURCES} ${SOURCES_FEFLOW})
+endif()
+
include(${PROJECT_SOURCE_DIR}/scripts/cmake/OGSEnabledElements.cmake)
# Create the library
diff --git a/GeoLib/IO/FEFLOW/FEFLOWGeoInterface.cpp b/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp
similarity index 100%
rename from GeoLib/IO/FEFLOW/FEFLOWGeoInterface.cpp
rename to Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp
diff --git a/GeoLib/IO/FEFLOW/FEFLOWGeoInterface.h b/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.h
similarity index 100%
rename from GeoLib/IO/FEFLOW/FEFLOWGeoInterface.h
rename to Applications/FileIO/FEFLOW/FEFLOWGeoInterface.h
diff --git a/MeshLib/IO/FEFLOW/FEFLOWMeshInterface.cpp b/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp
similarity index 99%
rename from MeshLib/IO/FEFLOW/FEFLOWMeshInterface.cpp
rename to Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp
index 94cefb444fe..7f23b437927 100644
--- a/MeshLib/IO/FEFLOW/FEFLOWMeshInterface.cpp
+++ b/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp
@@ -16,7 +16,7 @@
#include "BaseLib/FileTools.h"
#include "BaseLib/StringTools.h"
-#include "GeoLib/IO/FEFLOW/FEFLOWGeoInterface.h"
+#include "Applications/FileIO/FEFLOW/FEFLOWGeoInterface.h"
#include "GeoLib/Point.h"
#include "GeoLib/Polygon.h"
diff --git a/MeshLib/IO/FEFLOW/FEFLOWMeshInterface.h b/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.h
similarity index 100%
rename from MeshLib/IO/FEFLOW/FEFLOWMeshInterface.h
rename to Applications/FileIO/FEFLOW/FEFLOWMeshInterface.h
diff --git a/Applications/Utils/FileConverter/CMakeLists.txt b/Applications/Utils/FileConverter/CMakeLists.txt
index 73c4e705b14..e03f9d1bf2b 100644
--- a/Applications/Utils/FileConverter/CMakeLists.txt
+++ b/Applications/Utils/FileConverter/CMakeLists.txt
@@ -8,7 +8,7 @@ endif ()
if (QT4_FOUND)
add_executable(FEFLOW2OGS FEFLOW2OGS.cpp)
set_target_properties(FEFLOW2OGS PROPERTIES FOLDER Utilities)
- target_link_libraries(FEFLOW2OGS MeshLib)
+ target_link_libraries(FEFLOW2OGS ApplicationsFileIO)
ADD_VTK_DEPENDENCY(FEFLOW2OGS)
endif ()
diff --git a/Applications/Utils/FileConverter/FEFLOW2OGS.cpp b/Applications/Utils/FileConverter/FEFLOW2OGS.cpp
index 1339f774e42..98ca3899027 100644
--- a/Applications/Utils/FileConverter/FEFLOW2OGS.cpp
+++ b/Applications/Utils/FileConverter/FEFLOW2OGS.cpp
@@ -23,7 +23,7 @@
#endif
// FileIO
-#include "MeshLib/IO/FEFLOW/FEFLOWMeshInterface.h"
+#include "Applications/FileIO/FEFLOW/FEFLOWMeshInterface.h"
#include "MeshLib/IO/writeMeshToFile.h"
#include "MeshLib/IO/Legacy/MeshIO.h"
diff --git a/GeoLib/CMakeLists.txt b/GeoLib/CMakeLists.txt
index f0bb369a1e7..6e563dafb96 100644
--- a/GeoLib/CMakeLists.txt
+++ b/GeoLib/CMakeLists.txt
@@ -14,8 +14,6 @@ set(SOURCES ${SOURCES} ${SOURCES_IO_BASE_XML} ${SOURCES_IO_BOOST_XML} ${SOURCES_
if(QT4_FOUND)
GET_SOURCE_FILES(SOURCES_IO_QT_XML IO/XmlIO/Qt)
set(SOURCES ${SOURCES} ${SOURCES_IO_QT_XML})
- GET_SOURCE_FILES(SOURCES_IO_FEFLOW IO/FEFLOW)
- SET(SOURCES ${SOURCES} ${SOURCES_IO_FEFLOW})
endif()
GET_SOURCE_FILES(SOURCES_IO_GMSHIO IO/Gmsh)
diff --git a/MeshLib/CMakeLists.txt b/MeshLib/CMakeLists.txt
index 7ea38ca1e3f..a6e3926b582 100644
--- a/MeshLib/CMakeLists.txt
+++ b/MeshLib/CMakeLists.txt
@@ -20,11 +20,6 @@ set(SOURCES ${SOURCES_MESHLIB} ${SOURCES_ELEMENTS} ${SOURCES_EDITING}
${SOURCES_GENERATORS} ${SOURCES_QUALITY} ${SOURCES_SEARCH}
${SOURCES_IO} ${SOURCES_IO_LEGACY} ${SOURCES_IO_VTKIO} ${SOURCES_VTK})
-if(QT4_FOUND)
- GET_SOURCE_FILES(SOURCES_IO_FEFLOW IO/FEFLOW)
- SET(SOURCES ${SOURCES} ${SOURCES_IO_FEFLOW})
-endif()
-
# It could be used for other MPI based DDC approach in future.
if(OGS_USE_PETSC)
GET_SOURCE_FILES(SOURCES_MPI_IO IO/MPI_IO)
--
GitLab