From 7afb78e76b22a7f88aaf49a7fe0c1c143f82b23e Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Wed, 21 Aug 2019 09:20:53 +0200 Subject: [PATCH] Refactored GeoLib and ProcessLib to use the InfoLibs. --- GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp | 1 - GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp | 1 - ProcessLib/CMakeLists.txt | 2 +- ProcessLib/Output/ProcessOutput.cpp | 6 +++--- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp index 83116584302..4423db81cea 100644 --- a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp +++ b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp @@ -20,7 +20,6 @@ #include <logog/include/logog.hpp> -#include "BaseLib/BuildInfo.h" #include "BaseLib/FileFinder.h" #include "GeoLib/Triangle.h" diff --git a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp index 1b164185d46..c4f06a84bae 100644 --- a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp +++ b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp @@ -21,7 +21,6 @@ #include <RapidXML/rapidxml.hpp> #include <logog/include/logog.hpp> -#include "BaseLib/BuildInfo.h" #include "BaseLib/DateTools.h" #include "BaseLib/FileTools.h" #include "BaseLib/FileFinder.h" diff --git a/ProcessLib/CMakeLists.txt b/ProcessLib/CMakeLists.txt index 893b163d52b..96919836805 100644 --- a/ProcessLib/CMakeLists.txt +++ b/ProcessLib/CMakeLists.txt @@ -31,7 +31,7 @@ target_link_libraries(ProcessLib NumLib logog ChemistryLib - PRIVATE ParameterLib) + PRIVATE ParameterLib GitInfoLib) if(OGS_USE_PYTHON) add_subdirectory(BoundaryCondition/Python) diff --git a/ProcessLib/Output/ProcessOutput.cpp b/ProcessLib/Output/ProcessOutput.cpp index 327f412a0da..a3cc1565754 100644 --- a/ProcessLib/Output/ProcessOutput.cpp +++ b/ProcessLib/Output/ProcessOutput.cpp @@ -9,7 +9,7 @@ #include "ProcessOutput.h" -#include "BaseLib/BuildInfo.h" +#include "InfoLib/GitInfo.h" #include "MathLib/LinAlg/LinAlg.h" #include "MeshLib/IO/VtkIO/VtuInterface.h" #include "NumLib/DOF/LocalToGlobalIndexMap.h" @@ -24,8 +24,8 @@ static void addOgsVersion(MeshLib::Mesh& mesh) auto& ogs_version_field = *MeshLib::getOrCreateMeshProperty<char>( mesh, "OGS_VERSION", MeshLib::MeshItemType::IntegrationPoint, 1); - ogs_version_field.assign(BaseLib::BuildInfo::ogs_version.begin(), - BaseLib::BuildInfo::ogs_version.end()); + ogs_version_field.assign(GitInfoLib::GitInfo::ogs_version.begin(), + GitInfoLib::GitInfo::ogs_version.end()); } static void addSecondaryVariableNodes( -- GitLab