diff --git a/CoreApp/CMakeLists.txt b/CoreApp/CMakeLists.txt
index 0e3ed6c96e99e7b7cd60e92d2a66af71677a70f7..98a0f123bad686035a25ffae126253b96f01bce6 100644
--- a/CoreApp/CMakeLists.txt
+++ b/CoreApp/CMakeLists.txt
@@ -2,7 +2,7 @@ include (ACGCommon)
 
 include_directories (
   ..
-  ${OPENMESH_INCLUDE_DIR}
+  ${OPENMESH_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -176,8 +176,7 @@ endif()
 
 
 target_link_libraries (${OPENFLIPPER_PRODUCT_STRING}
-  OpenMeshCore
-  OpenMeshTools
+  ${OPENMESH_CORE_LIBRARIES}
   ACG
   OpenFlipperPluginLib
   ${QT_LIBRARIES}
diff --git a/PluginLib/CMakeLists.txt b/PluginLib/CMakeLists.txt
index 6f5a5a7957b1276a38bc229a1957dc9116c5b51f..9a87e93413ce4a063037f162c0036128457925e4 100644
--- a/PluginLib/CMakeLists.txt
+++ b/PluginLib/CMakeLists.txt
@@ -19,7 +19,7 @@ endforeach ()
 
 include_directories (
   ..
-  ${OPENMESH_INCLUDE_DIR}
+  ${OPENMESH_INCLUDE_DIRS}
   ${OPENVOLUMEMESH_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
@@ -126,8 +126,7 @@ if( ADDITIONAL_PLUGINLIB_COMPILER_FLAGS )
 endif()
 
 target_link_libraries (OpenFlipperPluginLib
-  OpenMeshCore
-  OpenMeshTools
+  ${OPENMESH_LIBRARIES}
   ${OPENVOLUMEMESH_LIBRARY}
   ACG
   ${QT_LIBRARIES}
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index 09369f8a326b5aecd1ca4ee6f92918343a6196f2..aef41fcc95b05797fa81c3cba63bcd4e052ceec4 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -384,7 +384,7 @@ function (_build_openflipper_plugin plugin)
     include_directories (
       .
       ${CMAKE_SOURCE_DIR}
-      ${OPENMESH_INCLUDE_DIR}
+      ${OPENMESH_INCLUDE_DIRS}
       ${OPENVOLUMEMESH_INCLUDE_DIR}
       ${CMAKE_CURRENT_SOURCE_DIR}
       ${CMAKE_CURRENT_BINARY_DIR}
@@ -532,8 +532,7 @@ function (_build_openflipper_plugin plugin)
       # generate dllinport defines
       add_definitions (-DACGDLL -DUSEACG -DPLUGINLIBDLL -DUSEPLUGINLIBDLL)
       target_link_libraries (Plugin-${plugin}
-    	OpenMeshCore
-        OpenMeshTools
+    	${OPENMESH_LIBRARIES}
         ${OPENVOLUMEMESH_LIBRARY}
         ACG
         OpenFlipperPluginLib