diff --git a/CMake/PackageDepends/MITK_OpenMesh_Config.cmake b/CMake/PackageDepends/MITK_OpenMesh_Config.cmake
index e69de29bb2..85d06a71dd 100644
--- a/CMake/PackageDepends/MITK_OpenMesh_Config.cmake
+++ b/CMake/PackageDepends/MITK_OpenMesh_Config.cmake
@@ -0,0 +1,7 @@
+find_package(OpenMesh COMPONENTS ${OpenMesh_REQUIRED_COMPONENTS_BY_MODULE} REQUIRED)
+
+foreach(openmesh_component ${OpenMesh_REQUIRED_COMPONENTS_BY_MODULE})
+  list(APPEND ALL_LIBRARIES "OpenMesh${openmesh_component}")
+endforeach()
+
+set(ALL_COMPILE_DEFINITIONS -D_USE_MATH_DEFINES)
diff --git a/Modules/Remeshing/CMakeLists.txt b/Modules/Remeshing/CMakeLists.txt
index 2697e18603..91db053ef8 100644
--- a/Modules/Remeshing/CMakeLists.txt
+++ b/Modules/Remeshing/CMakeLists.txt
@@ -1,9 +1,4 @@
 mitk_create_module(
   DEPENDS MitkCore
-  PACKAGE_DEPENDS OpenMesh|OpenMeshTools
+  PACKAGE_DEPENDS OpenMesh|Tools
 )
-
-if(TARGET ${MODULE_TARGET})
-  target_link_libraries(${MODULE_TARGET} PRIVATE OpenMeshTools)
-  target_compile_definitions(${MODULE_TARGET} PRIVATE -D_USE_MATH_DEFINES)
-endif()