diff --git a/Applications/FileIO/CMakeLists.txt b/Applications/FileIO/CMakeLists.txt index 0b1020ab3c355e1a3ddb18aec27cd34baf42ebdc..826f2e7c80b4c4fb7413f0f3402dcd1abe222ca2 100644 --- a/Applications/FileIO/CMakeLists.txt +++ b/Applications/FileIO/CMakeLists.txt @@ -1,13 +1,12 @@ GET_SOURCE_FILES(SOURCES) +APPEND_SOURCE_FILES(SOURCES Gmsh) + if(NOT Shapelib_FOUND) list(REMOVE_ITEM SOURCES SHPInterface.h SHPInterface.cpp) endif() -if(Qt5XmlPatterns_FOUND) - APPEND_SOURCE_FILES(SOURCES XmlIO/Qt) -endif() -APPEND_SOURCE_FILES(SOURCES Gmsh) if(Qt5XmlPatterns_FOUND) + APPEND_SOURCE_FILES(SOURCES XmlIO/Qt) APPEND_SOURCE_FILES(SOURCES FEFLOW) endif() @@ -22,13 +21,6 @@ include(${PROJECT_SOURCE_DIR}/scripts/cmake/OGSEnabledElements.cmake) add_library(ApplicationsFileIO ${SOURCES}) target_link_libraries(ApplicationsFileIO DataHolderLib) -if(Qt5XmlPatterns_FOUND) - target_link_libraries(ApplicationsFileIO Qt5::Xml Qt5::XmlPatterns) - if(WIN32 AND CMAKE_CROSSCOMPILING AND OPENSSL_FOUND) - target_link_libraries(ApplicationsFileIO Qt5::Network ${OPENSSL_LIBRARIES} ws2_32) - endif() -endif() - if(Shapelib_FOUND) target_link_libraries(ApplicationsFileIO ${Shapelib_LIBRARIES}) endif() diff --git a/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp b/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp index d15d577f39cdbb9f53ac2b58a2fdc5139b26a926..d926833ae2c6d5686976b519122b771f10c7ec2a 100644 --- a/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp +++ b/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp @@ -15,7 +15,7 @@ #include <QDomElement> #include <QString> -#include <QtXml> +#include <QtXml/QDomDocument> #include <logog/include/logog.hpp>