adjusted library paths and io namespaces for all tools

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)

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

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)

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;

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)

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;

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)

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++;