diff --git a/Applications/CMakeLists.txt b/Applications/CMakeLists.txt index c900269b5761f8622c02893b3bac3d03811fbc61..9db2c81a5af637c39a742dfe699bae8e834b8c44 100644 --- a/Applications/CMakeLists.txt +++ b/Applications/CMakeLists.txt @@ -1,6 +1,7 @@ include(${PROJECT_SOURCE_DIR}/scripts/cmake/OGSEnabledElements.cmake) add_subdirectory(ApplicationsLib) +add_subdirectory(DataHolderLib) add_subdirectory(FileIO) if(OGS_BUILD_UTILS AND NOT IS_SUBPROJECT) diff --git a/Applications/DataExplorer/DataView/MeshElementRemovalDialog.h b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.h index 6a7adf5b3e4458a0926745987dad023bb559eb0f..c5fd869141fceb16ae36ed902c1d65dac4a3c414 100644 --- a/Applications/DataExplorer/DataView/MeshElementRemovalDialog.h +++ b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.h @@ -19,7 +19,7 @@ #include <QDialog> #ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 -#include "DataHolderLib/Project.h" +#include "Applications/DataHolderLib/Project.h" #endif class Node; diff --git a/Applications/DataExplorer/DataView/MshModel.h b/Applications/DataExplorer/DataView/MshModel.h index 822f35b06d1ec30820b5a07dd97425577f0d43aa..a58e05f09883b41bd49173612bdaea4540a51517 100644 --- a/Applications/DataExplorer/DataView/MshModel.h +++ b/Applications/DataExplorer/DataView/MshModel.h @@ -17,7 +17,7 @@ // ** INCLUDES ** #ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 -#include "DataHolderLib/Project.h" +#include "Applications/DataHolderLib/Project.h" #endif #include "MeshLib/MeshEnums.h" diff --git a/Applications/DataExplorer/mainwindow.h b/Applications/DataExplorer/mainwindow.h index 9c2b6e6af283f2380b349f885164bb60f7b06b9b..84de7a9523d818a4af466c5ebfb4e62319144a51 100644 --- a/Applications/DataExplorer/mainwindow.h +++ b/Applications/DataExplorer/mainwindow.h @@ -18,7 +18,7 @@ #include <memory> #ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 -#include "DataHolderLib/Project.h" +#include "Applications/DataHolderLib/Project.h" #endif #include "ImportFileTypes.h" diff --git a/DataHolderLib/CMakeLists.txt b/Applications/DataHolderLib/CMakeLists.txt similarity index 100% rename from DataHolderLib/CMakeLists.txt rename to Applications/DataHolderLib/CMakeLists.txt diff --git a/DataHolderLib/Project.cpp b/Applications/DataHolderLib/Project.cpp similarity index 100% rename from DataHolderLib/Project.cpp rename to Applications/DataHolderLib/Project.cpp diff --git a/DataHolderLib/Project.h b/Applications/DataHolderLib/Project.h similarity index 100% rename from DataHolderLib/Project.h rename to Applications/DataHolderLib/Project.h diff --git a/Applications/FileIO/XmlIO/Qt/XmlGspInterface.h b/Applications/FileIO/XmlIO/Qt/XmlGspInterface.h index 2354d46d47a716b3aafb83a5720e5ea9a8899668..4a618a3a79e07d57f7894cb04e42812ee4137958 100644 --- a/Applications/FileIO/XmlIO/Qt/XmlGspInterface.h +++ b/Applications/FileIO/XmlIO/Qt/XmlGspInterface.h @@ -23,7 +23,7 @@ #include "BaseLib/IO/XmlIO/XMLInterface.h" #include "BaseLib/IO/XmlIO/Qt/XMLQtInterface.h" -#include "DataHolderLib/Project.h" +#include "Applications/DataHolderLib/Project.h" namespace FileIO { diff --git a/CMakeLists.txt b/CMakeLists.txt index a0eb462d6702d22d233d0cc46234f8a69d6e0a91..108d4fc6f9d9658fa59344a1c7cb636482466cd4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,7 +181,6 @@ add_subdirectory( BaseLib ) if(TARGET Boost) add_dependencies(BaseLib Boost) endif() -add_subdirectory( DataHolderLib ) add_subdirectory( FileIO ) add_subdirectory( GeoLib ) add_subdirectory( MaterialsLib )