From b798198456082180bc9fed7bf6b73b94b7edcd7d Mon Sep 17 00:00:00 2001
From: rinkk <karsten.rink@ufz.de>
Date: Fri, 20 May 2016 12:19:42 +0200
Subject: [PATCH] adjusted library paths and io namespaces for all tools
---
CMakeLists.txt | 16 +++++----
EmiData2PolyData/CMakeLists.txt | 36 +++++++++----------
ErtData2Mesh/CMakeLists.txt | 4 +--
ErtData2Mesh/ErtData2Mesh.cpp | 8 ++---
addEmiDataToMesh/CMakeLists.txt | 4 +--
addEmiDataToMesh/addEmiDataToMesh.cpp | 6 ++--
addScalarArrayTimeSeries/CMakeLists.txt | 4 +--
.../addScalarArrayTimeSeries.cpp | 10 +++---
8 files changed, 46 insertions(+), 42 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0f7b17..812a9c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,13 +9,17 @@ include(ProjectSetup)
add_subdirectory(${CMAKE_SOURCE_DIR}/ogs)
-include_directories(ogs)
-include_directories(ogs/ThirdParty)
-include_directories(${Boost_INCLUDE_DIRS})
-
-find_package(VTK 6.1 COMPONENTS vtkIOXML NO_MODULE QUIET)
-include( ${VTK_USE_FILE} )
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+include_directories(
+ ${CMAKE_SOURCE_DIR}/ogs
+ ${CMAKE_SOURCE_DIR}/ogs/ThirdParty
+ ${CMAKE_SOURCE_DIR}/ogs/ThirdParty/tclap/include
+ ${Boost_INCLUDE_DIRS}
+ ${CONAN_INCLUDE_DIRS}
+)
add_subdirectory(addEmiDataToMesh)
add_subdirectory(addScalarArrayTimeSeries)
+#add_subdirectory(EmiData2PolyData)
add_subdirectory(ErtData2Mesh)
+add_subdirectory(makeBuildings)
diff --git a/EmiData2PolyData/CMakeLists.txt b/EmiData2PolyData/CMakeLists.txt
index 0be52f5..deed4b4 100644
--- a/EmiData2PolyData/CMakeLists.txt
+++ b/EmiData2PolyData/CMakeLists.txt
@@ -19,10 +19,10 @@ if(QT4_FOUND)
MathLib
MeshLib
InSituLib
- ${CATALYST_LIBRARIES}
+ ${VTK_LIBRARIES}
${QT_LIBRARIES}
)
- ADD_CATALYST_DEPENDENCY(moveMeshNodes)
+ ADD_VTK_DEPENDENCY(moveMeshNodes)
set_target_properties(moveMeshNodes PROPERTIES FOLDER Utilities)
@@ -34,7 +34,7 @@ if(QT4_FOUND)
InSituLib
MeshLib
MeshGeoToolsLib
- ${CATALYST_LIBRARIES}
+ ${VTK_LIBRARIES}
${QT_LIBRARIES}
)
set_target_properties(EmiData2PolyData PROPERTIES FOLDER Utilities)
@@ -48,9 +48,9 @@ target_link_libraries(removeMeshElements
MathLib
MeshLib
InSituLib
- ${CATALYST_LIBRARIES}
+ ${VTK_LIBRARIES}
)
-ADD_CATALYST_DEPENDENCY(removeMeshElements)
+ADD_VTK_DEPENDENCY(removeMeshElements)
set_target_properties(removeMeshElements PROPERTIES FOLDER Utilities)
add_executable(DataExplorer5NodeReordering DataExplorer5NodeReordering.cpp)
@@ -58,9 +58,9 @@ target_link_libraries(DataExplorer5NodeReordering
FileIO
MeshLib
InSituLib
- ${CATALYST_LIBRARIES}
+ ${VTK_LIBRARIES}
)
-ADD_CATALYST_DEPENDENCY(DataExplorer5NodeReordering)
+ADD_VTK_DEPENDENCY(DataExplorer5NodeReordering)
set_target_properties(DataExplorer5NodeReordering PROPERTIES FOLDER Utilities)
add_executable(MoveMesh MoveMesh.cpp)
@@ -68,9 +68,9 @@ target_link_libraries(MoveMesh
FileIO
MeshLib
InSituLib
- ${CATALYST_LIBRARIES}
+ ${VTK_LIBRARIES}
)
-ADD_CATALYST_DEPENDENCY(MoveMesh)
+ADD_VTK_DEPENDENCY(MoveMesh)
set_target_properties(MoveMesh PROPERTIES FOLDER Utilities)
add_executable(appendLinesAlongPolyline appendLinesAlongPolyline.cpp)
@@ -81,9 +81,9 @@ target_link_libraries(appendLinesAlongPolyline
MeshLib
MeshGeoToolsLib
InSituLib
- ${CATALYST_LIBRARIES}
+ ${VTK_LIBRARIES}
)
-ADD_CATALYST_DEPENDENCY(appendLinesAlongPolyline)
+ADD_VTK_DEPENDENCY(appendLinesAlongPolyline)
set_target_properties(appendLinesAlongPolyline
PROPERTIES FOLDER Utilities)
@@ -95,9 +95,9 @@ target_link_libraries(editMaterialID
MathLib
MeshLib
InSituLib
- ${CATALYST_LIBRARIES}
+ ${VTK_LIBRARIES}
)
-ADD_CATALYST_DEPENDENCY(editMaterialID)
+ADD_VTK_DEPENDENCY(editMaterialID)
set_target_properties(editMaterialID
PROPERTIES FOLDER Utilities)
@@ -109,9 +109,9 @@ target_link_libraries(checkMesh
MathLib
MeshLib
InSituLib
- ${CATALYST_LIBRARIES}
+ ${VTK_LIBRARIES}
)
-ADD_CATALYST_DEPENDENCY(checkMesh)
+ADD_VTK_DEPENDENCY(checkMesh)
set_target_properties(checkMesh PROPERTIES FOLDER Utilities)
@@ -122,9 +122,9 @@ target_link_libraries (reviseMesh
MathLib
MeshLib
InSituLib
- ${CATALYST_LIBRARIES}
+ ${VTK_LIBRARIES}
)
-ADD_CATALYST_DEPENDENCY(reviseMesh)
+ADD_VTK_DEPENDENCY(reviseMesh)
set_target_properties(reviseMesh
PROPERTIES FOLDER Utilities)
@@ -134,7 +134,7 @@ target_link_libraries(ResetPropertiesInPolygonalRegion
FileIO
MeshLib
InSituLib
- ${CATALYST_LIBRARIES}
+ ${VTK_LIBRARIES}
)
set_target_properties(ResetPropertiesInPolygonalRegion
diff --git a/ErtData2Mesh/CMakeLists.txt b/ErtData2Mesh/CMakeLists.txt
index faf3a27..412744e 100644
--- a/ErtData2Mesh/CMakeLists.txt
+++ b/ErtData2Mesh/CMakeLists.txt
@@ -4,7 +4,7 @@ target_link_libraries(ErtData2Mesh
BaseLib
FileIO
InSituLib
- ${CATALYST_LIBRARIES}
+ ${VTK_LIBRARIES}
)
-ADD_CATALYST_DEPENDENCY(ErtData2Mesh)
+ADD_VTK_DEPENDENCY(ErtData2Mesh)
set_target_properties(ErtData2Mesh PROPERTIES FOLDER Utilities)
diff --git a/ErtData2Mesh/ErtData2Mesh.cpp b/ErtData2Mesh/ErtData2Mesh.cpp
index 76593d8..6bb73ef 100644
--- a/ErtData2Mesh/ErtData2Mesh.cpp
+++ b/ErtData2Mesh/ErtData2Mesh.cpp
@@ -24,9 +24,9 @@
#include "BaseLib/LogogSimpleFormatter.h"
// FileIO
-#include "FileIO/VtkIO/VtuInterface.h"
+#include "MeshLib/IO/VtkIO/VtuInterface.h"
#include "FileIO/CsvInterface.h"
-#include "FileIO/AsciiRasterInterface.h"
+#include "GeoLib/IO/AsciiRasterInterface.h"
// GeoLib
#include "GeoLib/Point.h"
@@ -122,7 +122,7 @@ int main (int argc, char* argv[])
std::vector<double> elevation_correction (nodes.size(), 0.0);
if (dem_in.isSet())
{
- GeoLib::Raster* dem = FileIO::AsciiRasterInterface::readRaster(dem_in.getValue());
+ GeoLib::Raster* dem = GeoLib::IO::AsciiRasterInterface::readRaster(dem_in.getValue());
elevation_correction = getElevationCorrectionValues(*dem, nodes);
delete dem;
}
@@ -176,7 +176,7 @@ int main (int argc, char* argv[])
*/
INFO ("Writing result...");
- FileIO::VtuInterface vtu(&mesh);
+ MeshLib::IO::VtuInterface vtu(&mesh);
vtu.writeToFile(mesh_out.getValue());
//delete mesh;
diff --git a/addEmiDataToMesh/CMakeLists.txt b/addEmiDataToMesh/CMakeLists.txt
index a806b37..8a98df3 100644
--- a/addEmiDataToMesh/CMakeLists.txt
+++ b/addEmiDataToMesh/CMakeLists.txt
@@ -4,7 +4,7 @@ target_link_libraries(addEmiDataToMesh
BaseLib
FileIO
InSituLib
- ${CATALYST_LIBRARIES}
+ ${VTK_LIBRARIES}
)
-ADD_CATALYST_DEPENDENCY(addEmiDataToMesh)
+ADD_VTK_DEPENDENCY(addEmiDataToMesh)
set_target_properties(addEmiDataToMesh PROPERTIES FOLDER Utilities)
diff --git a/addEmiDataToMesh/addEmiDataToMesh.cpp b/addEmiDataToMesh/addEmiDataToMesh.cpp
index 8f3972c..b4891f3 100644
--- a/addEmiDataToMesh/addEmiDataToMesh.cpp
+++ b/addEmiDataToMesh/addEmiDataToMesh.cpp
@@ -23,7 +23,7 @@
#include "BaseLib/LogogSimpleFormatter.h"
// FileIO
-#include "FileIO/VtkIO/VtuInterface.h"
+#include "MeshLib/IO/VtkIO/VtuInterface.h"
#include "FileIO/CsvInterface.h"
// GeoLib
@@ -137,7 +137,7 @@ int main (int argc, char* argv[])
cmd.parse(argc, argv);
INFO ("Reading mesh %s.", mesh_in.getValue().c_str());
- MeshLib::Mesh* mesh (FileIO::VtuInterface::readVTUFile(mesh_in.getValue()));
+ MeshLib::Mesh* mesh (MeshLib::IO::VtuInterface::readVTUFile(mesh_in.getValue()));
if (mesh == nullptr)
{
ERR ("Error reading mesh file.");
@@ -180,7 +180,7 @@ int main (int argc, char* argv[])
std::copy(data.cbegin(), data.cend(), std::back_inserter(*v_vector));
INFO ("Writing result...");
- FileIO::VtuInterface vtu(mesh);
+ MeshLib::IO::VtuInterface vtu(mesh);
vtu.writeToFile(mesh_out.getValue());
delete mesh;
diff --git a/addScalarArrayTimeSeries/CMakeLists.txt b/addScalarArrayTimeSeries/CMakeLists.txt
index f243a27..de21890 100644
--- a/addScalarArrayTimeSeries/CMakeLists.txt
+++ b/addScalarArrayTimeSeries/CMakeLists.txt
@@ -4,7 +4,7 @@ target_link_libraries(addScalarArrayTimeSeries
BaseLib
FileIO
InSituLib
- ${CATALYST_LIBRARIES}
+ ${VTK_LIBRARIES}
)
-ADD_CATALYST_DEPENDENCY(addScalarArrayTimeSeries)
+ADD_VTK_DEPENDENCY(addScalarArrayTimeSeries)
set_target_properties(addScalarArrayTimeSeries PROPERTIES FOLDER Utilities)
diff --git a/addScalarArrayTimeSeries/addScalarArrayTimeSeries.cpp b/addScalarArrayTimeSeries/addScalarArrayTimeSeries.cpp
index 08e2eb5..967754a 100644
--- a/addScalarArrayTimeSeries/addScalarArrayTimeSeries.cpp
+++ b/addScalarArrayTimeSeries/addScalarArrayTimeSeries.cpp
@@ -25,9 +25,9 @@
#include "BaseLib/FileTools.h"
// FileIO
-#include "FileIO/VtkIO/VtuInterface.h"
+#include "MeshLib/IO/VtkIO/VtuInterface.h"
#include "FileIO/CsvInterface.h"
-#include "FileIO/AsciiRasterInterface.h"
+#include "GeoLib/IO/AsciiRasterInterface.h"
// GeoLib
#include "GeoLib/Point.h"
@@ -164,7 +164,7 @@ int main (int argc, char* argv[])
MeshLib::Mesh* mesh = nullptr;
if (mesh_new.isSet())
{
- mesh = FileIO::VtuInterface::readVTUFile(mesh_new.getValue());
+ mesh = MeshLib::IO::VtuInterface::readVTUFile(mesh_new.getValue());
if (mesh == nullptr)
{
@@ -190,7 +190,7 @@ int main (int argc, char* argv[])
{
if (!mesh_new.isSet())
{
- mesh = FileIO::VtuInterface::readVTUFile(mesh_add.getValue() + number2str(file_counter) + ".vtu");
+ mesh = MeshLib::IO::VtuInterface::readVTUFile(mesh_add.getValue() + number2str(file_counter) + ".vtu");
if (mesh==nullptr)
{
ERR("No base mesh given and no mesh for time step %d found.", file_counter);
@@ -232,7 +232,7 @@ int main (int argc, char* argv[])
if (overwrite == false)
return -7;
}
- FileIO::VtuInterface vtu(mesh);
+ MeshLib::IO::VtuInterface vtu(mesh);
vtu.writeToFile(output_name);
file_counter++;
--
GitLab