From 517f1dc2151c7e7104bf9a360762cc3d43c437dc Mon Sep 17 00:00:00 2001
From: Philipp Suffa <philipp.suffa@fau.de>
Date: Mon, 3 Mar 2025 16:34:55 +0100
Subject: [PATCH] Fixes some prefix errors for mesh module
---
apps/benchmarks/ComplexGeometry/CMakeLists.txt | 2 +-
apps/showcases/PegIntoSphereBed/CMakeLists.txt | 2 +-
apps/tutorials/codegen/CMakeLists.txt | 4 ++--
apps/tutorials/lbm/CMakeLists.txt | 2 +-
src/mesh/CMakeLists.txt | 4 ++--
src/mesh_common/CMakeLists.txt | 2 +-
tests/mesa_pd/CMakeLists.txt | 8 ++++----
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/apps/benchmarks/ComplexGeometry/CMakeLists.txt b/apps/benchmarks/ComplexGeometry/CMakeLists.txt
index 76a434fbb..27176e274 100644
--- a/apps/benchmarks/ComplexGeometry/CMakeLists.txt
+++ b/apps/benchmarks/ComplexGeometry/CMakeLists.txt
@@ -3,7 +3,7 @@ if ( WALBERLA_BUILD_WITH_OPENMESH )
waLBerla_link_geometry_to_builddir( "*.obj" )
waLBerla_link_files_to_builddir( "*.conf" )
- waLBerla_add_executable( NAME ComplexGeometry FILES ComplexGeometry.cpp DEPENDS walberla::boundary walberla::core walberla::lbm mesh walberla::vtk )
+ waLBerla_add_executable( NAME ComplexGeometry FILES ComplexGeometry.cpp DEPENDS walberla::boundary walberla::core walberla::lbm walberla::mesh walberla::vtk )
##############
# Some tests #
diff --git a/apps/showcases/PegIntoSphereBed/CMakeLists.txt b/apps/showcases/PegIntoSphereBed/CMakeLists.txt
index 7a71c0c6e..e5daf1026 100644
--- a/apps/showcases/PegIntoSphereBed/CMakeLists.txt
+++ b/apps/showcases/PegIntoSphereBed/CMakeLists.txt
@@ -3,5 +3,5 @@ waLBerla_link_files_to_builddir( *.cfg )
if (OPENMESH_FOUND AND WALBERLA_MESAPD_CONVEX_POLYHEDRON_AVAILABLE)
waLBerla_add_executable ( NAME MESA_PD_MESH_APP_PegIntoSphereBed
FILES PegIntoSphereBed.cpp
- DEPENDS walberla::blockforest mesh_common walberla::mesa_pd walberla::core walberla::vtk )
+ DEPENDS walberla::blockforest walberla::mesh_common walberla::mesa_pd walberla::core walberla::vtk )
endif()
\ No newline at end of file
diff --git a/apps/tutorials/codegen/CMakeLists.txt b/apps/tutorials/codegen/CMakeLists.txt
index fb4cc9b77..f0cad4bd4 100644
--- a/apps/tutorials/codegen/CMakeLists.txt
+++ b/apps/tutorials/codegen/CMakeLists.txt
@@ -66,10 +66,10 @@ if( WALBERLA_BUILD_WITH_CODEGEN )
InfoHeader.h
)
- set( TUT4_DEPENDENCIES walberla::blockforest walberla::boundary walberla::core walberla::field walberla::geometry walberla::lbm lbm_generated walberla::mesh walberla::python_coupling walberla::stencil walberla::timeloop walberla::vtk 04_LBComplexGeometryPython )
+ set( TUT4_DEPENDENCIES walberla::blockforest walberla::boundary walberla::core walberla::field walberla::geometry walberla::lbm walberla::lbm_generated walberla::mesh walberla::python_coupling walberla::stencil walberla::timeloop walberla::vtk 04_LBComplexGeometryPython )
if(WALBERLA_BUILD_WITH_GPU_SUPPORT)
- list(APPEND TUT4_DEPENDENCIES gpu)
+ list(APPEND TUT4_DEPENDENCIES walberla::gpu)
endif()
walberla_generate_target_from_python(
diff --git a/apps/tutorials/lbm/CMakeLists.txt b/apps/tutorials/lbm/CMakeLists.txt
index 8fd53ddae..38d23d84d 100644
--- a/apps/tutorials/lbm/CMakeLists.txt
+++ b/apps/tutorials/lbm/CMakeLists.txt
@@ -19,7 +19,7 @@ waLBerla_link_geometry_to_builddir(*.obj)
waLBerla_add_executable ( NAME 04_LBComplexGeometry
FILES 04_LBComplexGeometry.cpp
- DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm mesh walberla::stencil walberla::timeloop walberla::vtk )
+ DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::mesh walberla::stencil walberla::timeloop walberla::vtk )
endif()
diff --git a/src/mesh/CMakeLists.txt b/src/mesh/CMakeLists.txt
index be45ad6d0..af4df5ad5 100644
--- a/src/mesh/CMakeLists.txt
+++ b/src/mesh/CMakeLists.txt
@@ -6,9 +6,9 @@
add_library( walberla_mesh )
add_library( walberla::mesh ALIAS walberla_mesh )
-target_link_libraries( walberla_mesh PUBLIC walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla:: walberla::pe walberla::stencil walberla::mesh_common )
+target_link_libraries( walberla_mesh PUBLIC walberla::blockforest walberla::boundary walberla::core walberla::domain_decomposition walberla::field walberla::geometry walberla::pe walberla::stencil walberla::mesh_common )
if ( OPENMESH_CORE_FOUND )
- target_link_directories( walberla::mesh PUBLIC OpenMeshCore )
+ target_link_directories( walberla_mesh PUBLIC OpenMeshCore )
endif()
target_sources( walberla_mesh
PRIVATE
diff --git a/src/mesh_common/CMakeLists.txt b/src/mesh_common/CMakeLists.txt
index 024e4d56e..2b4344448 100644
--- a/src/mesh_common/CMakeLists.txt
+++ b/src/mesh_common/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library( walberla_mesh_common INTERFACE )
add_library( walberla::mesh_common ALIAS walberla_mesh_common )
target_link_libraries( walberla_mesh_common INTERFACE walberla::core walberla::vtk )
if ( OPENMESH_CORE_FOUND )
- target_link_directories( walberla::mesh_common INTERFACE OpenMeshCore )
+ target_link_directories( walberla_mesh_common INTERFACE OpenMeshCore )
endif()
target_sources( walberla_mesh_common
INTERFACE
diff --git a/tests/mesa_pd/CMakeLists.txt b/tests/mesa_pd/CMakeLists.txt
index dd9e73ab6..0292c02cf 100644
--- a/tests/mesa_pd/CMakeLists.txt
+++ b/tests/mesa_pd/CMakeLists.txt
@@ -232,15 +232,15 @@ waLBerla_compile_test( NAME MESA_PD_VTK_Outputs FILES vtk/VTKOutputs.cpp DEPENDS
waLBerla_execute_test( NAME MESA_PD_VTK_Outputs PROCESSES 8 )
if (WALBERLA_MESAPD_CONVEX_POLYHEDRON_AVAILABLE)
- waLBerla_compile_test( NAME MESA_PD_VTK_ConvexPolyhedron FILES vtk/ConvexPolyhedronVTKOutput.cpp DEPENDS walberla::core walberla::mesa_pd mesh_common walberla::vtk )
+ waLBerla_compile_test( NAME MESA_PD_VTK_ConvexPolyhedron FILES vtk/ConvexPolyhedronVTKOutput.cpp DEPENDS walberla::core walberla::mesa_pd walberla::mesh_common walberla::vtk )
waLBerla_execute_test( NAME MESA_PD_VTK_ConvexPolyhedron )
- waLBerla_compile_test( NAME MESA_PD_Common_ContainsPointConvexPolyhedron FILES common/ContainsPointConvexPolyhedron.cpp DEPENDS walberla::core walberla::mesa_pd mesh_common )
+ waLBerla_compile_test( NAME MESA_PD_Common_ContainsPointConvexPolyhedron FILES common/ContainsPointConvexPolyhedron.cpp DEPENDS walberla::core walberla::mesa_pd walberla::mesh_common )
waLBerla_execute_test( NAME MESA_PD_Common_ContainsPointConvexPolyhedron )
- waLBerla_compile_test( NAME MESA_PD_Data_ConvexPolyhedron FILES data/ConvexPolyhedron.cpp DEPENDS walberla::core walberla::mesa_pd mesh_common )
+ waLBerla_compile_test( NAME MESA_PD_Data_ConvexPolyhedron FILES data/ConvexPolyhedron.cpp DEPENDS walberla::core walberla::mesa_pd walberla::mesh_common )
waLBerla_execute_test( NAME MESA_PD_Data_ConvexPolyhedron )
- waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_ConvexPolyhedron_GJK_EPA FILES collision_detection/ConvexPolyhedron_GJK_EPA.cpp DEPENDS walberla::core walberla::mesa_pd mesh_common )
+ waLBerla_compile_test( NAME MESA_PD_COLLISIONDETECTION_ConvexPolyhedron_GJK_EPA FILES collision_detection/ConvexPolyhedron_GJK_EPA.cpp DEPENDS walberla::core walberla::mesa_pd walberla::mesh_common )
waLBerla_execute_test( NAME MESA_PD_COLLISIONDETECTION_ConvexPolyhedron_GJK_EPA )
endif()
--
GitLab