From 63dec07db443b5776a34b8fb6efd81e06ebe4935 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Thu, 23 Jun 2016 06:21:06 +0200
Subject: [PATCH] [FileIO] Move GmshReader to FileIO.
---
Applications/DataExplorer/mainwindow.cpp | 2 +-
Applications/FileIO/CMakeLists.txt | 2 ++
{MeshLib/IO => Applications/FileIO/Gmsh}/GmshReader.cpp | 0
{MeshLib/IO => Applications/FileIO/Gmsh}/GmshReader.h | 0
Applications/Utils/FileConverter/CMakeLists.txt | 2 +-
Applications/Utils/FileConverter/GMSH2OGS.cpp | 2 +-
6 files changed, 5 insertions(+), 3 deletions(-)
rename {MeshLib/IO => Applications/FileIO/Gmsh}/GmshReader.cpp (100%)
rename {MeshLib/IO => Applications/FileIO/Gmsh}/GmshReader.h (100%)
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index be499898751..0890acb6ebc 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -64,9 +64,9 @@
#include "Applications/FileIO/FEFLOW/FEFLOWMeshInterface.h"
#include "MeshLib/IO/Legacy/MeshIO.h"
#include "MeshLib/IO/readMeshFromFile.h"
-#include "MeshLib/IO/GmshReader.h"
#include "Applications/FileIO/AsciiRasterInterface.h"
#include "Applications/FileIO/PetrelInterface.h"
+#include "Applications/FileIO/Gmsh/GmshReader.h"
#include "Applications/FileIO/TetGenInterface.h"
#include "Applications/FileIO/XmlIO/Qt/XmlGspInterface.h"
#include "GeoLib/IO/GMSHInterface.h"
diff --git a/Applications/FileIO/CMakeLists.txt b/Applications/FileIO/CMakeLists.txt
index 2d39952053a..5ab08941465 100644
--- a/Applications/FileIO/CMakeLists.txt
+++ b/Applications/FileIO/CMakeLists.txt
@@ -13,6 +13,8 @@ if(QT4_FOUND)
endif()
GET_SOURCE_FILES(SOURCES_RAPID_XML XmlIO/Rapid)
set(SOURCES ${SOURCES} ${SOURCES_RAPID_XML})
+GET_SOURCE_FILES(SOURCES_GMSH Gmsh)
+set(SOURCES ${SOURCES} ${SOURCES_GMSH})
if(QT4_FOUND)
GET_SOURCE_FILES(SOURCES_FEFLOW FEFLOW)
diff --git a/MeshLib/IO/GmshReader.cpp b/Applications/FileIO/Gmsh/GmshReader.cpp
similarity index 100%
rename from MeshLib/IO/GmshReader.cpp
rename to Applications/FileIO/Gmsh/GmshReader.cpp
diff --git a/MeshLib/IO/GmshReader.h b/Applications/FileIO/Gmsh/GmshReader.h
similarity index 100%
rename from MeshLib/IO/GmshReader.h
rename to Applications/FileIO/Gmsh/GmshReader.h
diff --git a/Applications/Utils/FileConverter/CMakeLists.txt b/Applications/Utils/FileConverter/CMakeLists.txt
index e03f9d1bf2b..e6ba59247e8 100644
--- a/Applications/Utils/FileConverter/CMakeLists.txt
+++ b/Applications/Utils/FileConverter/CMakeLists.txt
@@ -20,7 +20,7 @@ set_target_properties(generateMatPropsFromMatID
add_executable(GMSH2OGS GMSH2OGS.cpp)
set_target_properties(GMSH2OGS PROPERTIES FOLDER Utilities)
-target_link_libraries(GMSH2OGS MeshLib)
+target_link_libraries(GMSH2OGS ApplicationsFileIO)
ADD_VTK_DEPENDENCY(GMSH2OGS)
add_executable(OGS2VTK OGS2VTK.cpp)
diff --git a/Applications/Utils/FileConverter/GMSH2OGS.cpp b/Applications/Utils/FileConverter/GMSH2OGS.cpp
index d90b2726c24..2a532079b01 100644
--- a/Applications/Utils/FileConverter/GMSH2OGS.cpp
+++ b/Applications/Utils/FileConverter/GMSH2OGS.cpp
@@ -28,7 +28,7 @@
#include "BaseLib/MemWatch.h"
#endif
-#include "MeshLib/IO/GmshReader.h"
+#include "Applications/FileIO/Gmsh/GmshReader.h"
#include "MeshLib/IO/writeMeshToFile.h"
#include "MeshLib/MeshSearch/ElementSearch.h"
--
GitLab