From 800fc1326298b99509b6b990fe881b484d836737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20M=C3=B6ller?= <matthias.moeller@rwth-aachen.de>
Date: Tue, 10 Dec 2013 11:49:02 +0000
Subject: [PATCH] add cmake switch for external openmesh installation

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17898 383ad7c9-94d9-4d36-a494-682f7c89f535
---
 CoreApp/CMakeLists.txt   | 5 ++---
 PluginLib/CMakeLists.txt | 5 ++---
 cmake/plugin.cmake       | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/CoreApp/CMakeLists.txt b/CoreApp/CMakeLists.txt
index 0e3ed6c9..98a0f123 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 6f5a5a79..9a87e934 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 09369f8a..aef41fcc 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
-- 
GitLab