diff --git a/Applications/CMakeLists.txt b/Applications/CMakeLists.txt index 783587a50a1b0b48dc2b7f9043db2fe6f7298d04..9b9c5ad1716be4b45c6e4a00013490c89a84da99 100644 --- a/Applications/CMakeLists.txt +++ b/Applications/CMakeLists.txt @@ -1,5 +1,9 @@ ADD_SUBDIRECTORY(ApplicationsLib) +IF(OGS_BUILD_UTILS AND NOT IS_SUBPROJECT) + ADD_SUBDIRECTORY(Utils) +ENDIF() # OGS_BUILD_UTILS AND NOT IS_SUBPROJECT + IF(OGS_BUILD_GUI) ADD_DEFINITIONS(-DOGS_BUILD_GUI) ADD_SUBDIRECTORY(DataExplorer) diff --git a/Applications/Utils/CMakeLists.txt b/Applications/Utils/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..363765401e0a32730b59c4e7408d45296e6e68e3 --- /dev/null +++ b/Applications/Utils/CMakeLists.txt @@ -0,0 +1,3 @@ +ADD_SUBDIRECTORY( FileConverter ) +ADD_SUBDIRECTORY( MeshEdit ) +ADD_SUBDIRECTORY( SimpleMeshCreation ) diff --git a/Utils/FileConverter/CMakeLists.txt b/Applications/Utils/FileConverter/CMakeLists.txt similarity index 100% rename from Utils/FileConverter/CMakeLists.txt rename to Applications/Utils/FileConverter/CMakeLists.txt diff --git a/Utils/FileConverter/ConvertSHPToGLI.cpp b/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp similarity index 100% rename from Utils/FileConverter/ConvertSHPToGLI.cpp rename to Applications/Utils/FileConverter/ConvertSHPToGLI.cpp diff --git a/Utils/FileConverter/ConvertVtkToOsg.cpp b/Applications/Utils/FileConverter/ConvertVtkToOsg.cpp similarity index 100% rename from Utils/FileConverter/ConvertVtkToOsg.cpp rename to Applications/Utils/FileConverter/ConvertVtkToOsg.cpp diff --git a/Utils/FileConverter/FEFLOW2OGS.cpp b/Applications/Utils/FileConverter/FEFLOW2OGS.cpp similarity index 100% rename from Utils/FileConverter/FEFLOW2OGS.cpp rename to Applications/Utils/FileConverter/FEFLOW2OGS.cpp diff --git a/Utils/FileConverter/GMSH2OGS.cpp b/Applications/Utils/FileConverter/GMSH2OGS.cpp similarity index 100% rename from Utils/FileConverter/GMSH2OGS.cpp rename to Applications/Utils/FileConverter/GMSH2OGS.cpp diff --git a/Utils/FileConverter/OGS2VTK.cpp b/Applications/Utils/FileConverter/OGS2VTK.cpp similarity index 100% rename from Utils/FileConverter/OGS2VTK.cpp rename to Applications/Utils/FileConverter/OGS2VTK.cpp diff --git a/Utils/FileConverter/VTK2OGS.cpp b/Applications/Utils/FileConverter/VTK2OGS.cpp similarity index 100% rename from Utils/FileConverter/VTK2OGS.cpp rename to Applications/Utils/FileConverter/VTK2OGS.cpp diff --git a/Utils/FileConverter/generateBCFromPolyline.cpp b/Applications/Utils/FileConverter/generateBCFromPolyline.cpp similarity index 100% rename from Utils/FileConverter/generateBCFromPolyline.cpp rename to Applications/Utils/FileConverter/generateBCFromPolyline.cpp diff --git a/Utils/FileConverter/generateBCandGLI.cpp b/Applications/Utils/FileConverter/generateBCandGLI.cpp similarity index 100% rename from Utils/FileConverter/generateBCandGLI.cpp rename to Applications/Utils/FileConverter/generateBCandGLI.cpp diff --git a/Utils/FileConverter/generateMatPropsFromMatID.cpp b/Applications/Utils/FileConverter/generateMatPropsFromMatID.cpp similarity index 100% rename from Utils/FileConverter/generateMatPropsFromMatID.cpp rename to Applications/Utils/FileConverter/generateMatPropsFromMatID.cpp diff --git a/Utils/MeshEdit/CMakeLists.txt b/Applications/Utils/MeshEdit/CMakeLists.txt similarity index 100% rename from Utils/MeshEdit/CMakeLists.txt rename to Applications/Utils/MeshEdit/CMakeLists.txt diff --git a/Utils/MeshEdit/DataExplorer5NodeReordering.cpp b/Applications/Utils/MeshEdit/DataExplorer5NodeReordering.cpp similarity index 100% rename from Utils/MeshEdit/DataExplorer5NodeReordering.cpp rename to Applications/Utils/MeshEdit/DataExplorer5NodeReordering.cpp diff --git a/Utils/MeshEdit/MoveMesh.cpp b/Applications/Utils/MeshEdit/MoveMesh.cpp similarity index 100% rename from Utils/MeshEdit/MoveMesh.cpp rename to Applications/Utils/MeshEdit/MoveMesh.cpp diff --git a/Utils/MeshEdit/appendLinesAlongPolyline.cpp b/Applications/Utils/MeshEdit/appendLinesAlongPolyline.cpp similarity index 100% rename from Utils/MeshEdit/appendLinesAlongPolyline.cpp rename to Applications/Utils/MeshEdit/appendLinesAlongPolyline.cpp diff --git a/Utils/MeshEdit/editMaterialID.cpp b/Applications/Utils/MeshEdit/editMaterialID.cpp similarity index 100% rename from Utils/MeshEdit/editMaterialID.cpp rename to Applications/Utils/MeshEdit/editMaterialID.cpp diff --git a/Utils/MeshEdit/moveMeshNodes.cpp b/Applications/Utils/MeshEdit/moveMeshNodes.cpp similarity index 100% rename from Utils/MeshEdit/moveMeshNodes.cpp rename to Applications/Utils/MeshEdit/moveMeshNodes.cpp diff --git a/Utils/MeshEdit/removeMeshElements.cpp b/Applications/Utils/MeshEdit/removeMeshElements.cpp similarity index 100% rename from Utils/MeshEdit/removeMeshElements.cpp rename to Applications/Utils/MeshEdit/removeMeshElements.cpp diff --git a/Utils/MeshEdit/removeMeshNodes.cpp b/Applications/Utils/MeshEdit/removeMeshNodes.cpp similarity index 100% rename from Utils/MeshEdit/removeMeshNodes.cpp rename to Applications/Utils/MeshEdit/removeMeshNodes.cpp diff --git a/Utils/SimpleMeshCreation/CMakeLists.txt b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt similarity index 100% rename from Utils/SimpleMeshCreation/CMakeLists.txt rename to Applications/Utils/SimpleMeshCreation/CMakeLists.txt diff --git a/Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp b/Applications/Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp similarity index 100% rename from Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp rename to Applications/Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp diff --git a/Utils/SimpleMeshCreation/generateStructuredMesh.cpp b/Applications/Utils/SimpleMeshCreation/generateStructuredMesh.cpp similarity index 100% rename from Utils/SimpleMeshCreation/generateStructuredMesh.cpp rename to Applications/Utils/SimpleMeshCreation/generateStructuredMesh.cpp diff --git a/Utils/SimpleMeshCreation/generateStructuredQuadMesh.cpp b/Applications/Utils/SimpleMeshCreation/generateStructuredQuadMesh.cpp similarity index 100% rename from Utils/SimpleMeshCreation/generateStructuredQuadMesh.cpp rename to Applications/Utils/SimpleMeshCreation/generateStructuredQuadMesh.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index fcb39262a268423c4648487e1d7297ea42da4b6d..f4959b63706ac546526a123f7c4be1e0a0028797 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,11 +160,6 @@ IF( OGS_BUILD_TESTS AND NOT IS_SUBPROJECT ) SET_TARGET_PROPERTIES(data PROPERTIES EXCLUDE_FROM_ALL 1) ADD_DEPENDENCIES(ctest data) ENDIF() # OGS_BUILD_TESTS -IF(OGS_BUILD_UTILS AND NOT IS_SUBPROJECT) - ADD_SUBDIRECTORY( Utils/SimpleMeshCreation ) - ADD_SUBDIRECTORY( Utils/FileConverter ) - ADD_SUBDIRECTORY( Utils/MeshEdit ) -ENDIF() # OGS_BUILD_UTILS # The configuration must be called from the source dir and not BaseLib/. CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/BaseLib/BuildInfo.cpp.in"