Skip to content
Snippets Groups Projects
Commit 3a09f7b1 authored by Frederik Hennig's avatar Frederik Hennig
Browse files

Merge branch 'suffa/prefix_fixes_mesh' into 'master'

Fixes some prefix errors for mesh module

See merge request !714
parents 0aab9c0a 517f1dc2
Branches
No related merge requests found
Pipeline #75157 passed with stages
in 8 hours, 36 minutes, and 24 seconds
......@@ -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 #
......
......@@ -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
......@@ -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(
......
......@@ -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()
......
......@@ -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
......
......@@ -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
......
......@@ -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()
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment