Skip to content
Snippets Groups Projects
Commit 46b7f1a0 authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

Merge branch 'RemoveQtDependencyFromGeoTools' into 'master'

Remove Qt dependency from MoveGeometry and TriangulatePolyline

See merge request ogs/ogs!3829
parents 315f0ebb 1836e43c
No related branches found
No related tags found
No related merge requests found
if(NOT OGS_BUILD_GUI)
return()
endif()
set(TOOLS MoveGeometry TriangulatePolyline)
foreach(tool ${TOOLS})
ogs_add_executable(${tool} ${tool}.cpp)
target_link_libraries(
${tool} GeoLib GitInfoLib ApplicationsFileIO tclap Qt5::Core
${tool} GeoLib GitInfoLib ApplicationsFileIO tclap
)
endforeach()
install(TARGETS ${TOOLS} RUNTIME DESTINATION bin)
......@@ -14,16 +14,12 @@
// ThirdParty
#include <tclap/CmdLine.h>
#include <QCoreApplication>
#include "GeoLib/GEOObjects.h"
#include "GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h"
#include "GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.h"
#include "InfoLib/GitInfo.h"
int main(int argc, char* argv[])
{
QCoreApplication app(argc, argv);
TCLAP::CmdLine cmd(
"Moves the points of a geometry by a given displacement vector\n\n"
"OpenGeoSys-6 software, version " +
......@@ -50,7 +46,7 @@ int main(int argc, char* argv[])
cmd.parse(argc, argv);
GeoLib::GEOObjects geo_objects;
GeoLib::IO::XmlGmlInterface xml(geo_objects);
GeoLib::IO::BoostXmlGmlInterface xml(geo_objects);
try
{
if (!xml.readFile(geo_input_arg.getValue()))
......
......@@ -13,13 +13,12 @@
#include <tclap/CmdLine.h>
#include <QCoreApplication>
#include <string>
#include "Applications/FileIO/Legacy/createSurface.h"
#include "GeoLib/AnalyticalGeometry.h"
#include "GeoLib/GEOObjects.h"
#include "GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h"
#include "GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.h"
#include "GeoLib/Polyline.h"
#include "InfoLib/GitInfo.h"
......@@ -34,8 +33,6 @@ std::string output_question()
int main(int argc, char* argv[])
{
QCoreApplication app(argc, argv, false);
TCLAP::CmdLine cmd(
"Triangulates the specified polyline in the given geometry file.\n\n"
"OpenGeoSys-6 software, version " +
......@@ -63,7 +60,7 @@ int main(int argc, char* argv[])
std::string const& polyline_name(name_arg.getValue());
GeoLib::GEOObjects geo_objects;
GeoLib::IO::XmlGmlInterface xml(geo_objects);
GeoLib::IO::BoostXmlGmlInterface xml(geo_objects);
try
{
if (!xml.readFile(file_name))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment