diff --git a/Installation/cmake/modules/FindOpenMesh.cmake b/Installation/cmake/modules/FindOpenMesh.cmake
index 3e5060d6dd3..124c911768a 100644
--- a/Installation/cmake/modules/FindOpenMesh.cmake
+++ b/Installation/cmake/modules/FindOpenMesh.cmake
@@ -6,6 +6,8 @@
 #  OPENMESH_LIBRARIES - OpenMesh libraries
 #
 
+find_package(OpenMesh NO_MODULE QUIET)
+
 # Is it already configured?
 if (NOT OpenMesh_FOUND)
 
@@ -52,6 +54,11 @@ find_package_handle_standard_args(OpenMesh
 if(OpenMesh_FOUND AND NOT TARGET OpenMesh::OpenMesh)
   add_library(OpenMesh::OpenMesh UNKNOWN IMPORTED)
 
+  if(TARGET OpenMeshCore)
+    target_link_libraries(OpenMesh::OpenMesh PUBLIC OpenMeshCore)
+    return()
+  endif()
+
   set_target_properties(OpenMesh::OpenMesh PROPERTIES
     INTERFACE_COMPILE_DEFINITIONS "CGAL_USE_OPENMESH;NOMINMAX;_USE_MATH_DEFINES"
     INTERFACE_INCLUDE_DIRECTORIES  "${OPENMESH_INCLUDE_DIRS}")