From 09267c3e3d8efedd19e395a75aad3129fc0fd347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Wed, 23 Feb 2022 09:29:19 +0100
Subject: [PATCH] Fixed win32 static part

---
 src/OpenMesh/Core/CMakeLists.txt  | 15 +++++----------
 src/OpenMesh/Tools/CMakeLists.txt | 12 ++++--------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/OpenMesh/Core/CMakeLists.txt b/src/OpenMesh/Core/CMakeLists.txt
index 977e2188..46f0beb6 100644
--- a/src/OpenMesh/Core/CMakeLists.txt
+++ b/src/OpenMesh/Core/CMakeLists.txt
@@ -140,20 +140,15 @@ if (WIN32)
   if ( OPENMESH_BUILD_SHARED )
     add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)
     vci_add_library (OpenMeshCore SHARED ${sources} ${headers})
-
-    target_include_directories(OpenMeshCore PUBLIC
-                                          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
-                                          $<INSTALL_INTERFACE:include>)
-
   else()
-    # OpenMesh has no dll exports so we have to build a static library on windows
     vci_add_library (OpenMeshCore STATIC ${sources} ${headers})
-
-    target_include_directories(OpenMeshCoreStatic PUBLIC
-                                          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
-                                          $<INSTALL_INTERFACE:include>)
   endif()
 
+  target_include_directories(OpenMeshCore PUBLIC
+                                        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
+                                        $<INSTALL_INTERFACE:include>)
+
+
 else ()
   vci_add_library (OpenMeshCore SHAREDANDSTATIC ${sources} ${headers})
 
diff --git a/src/OpenMesh/Tools/CMakeLists.txt b/src/OpenMesh/Tools/CMakeLists.txt
index 91e3b692..1c90491e 100644
--- a/src/OpenMesh/Tools/CMakeLists.txt
+++ b/src/OpenMesh/Tools/CMakeLists.txt
@@ -106,19 +106,15 @@ if (WIN32)
   if ( OPENMESH_BUILD_SHARED )
     add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)
     vci_add_library (OpenMeshTools SHARED ${sources} ${headers})
-
-    target_include_directories(OpenMeshTools PUBLIC
-                                          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
-                                          $<INSTALL_INTERFACE:include>)
   else()
     # OpenMesh has no dll exports so we have to build a static library on windows
     vci_add_library (OpenMeshTools STATIC ${sources} ${headers})
-
-    target_include_directories(OpenMeshToolsStatic PUBLIC
-                                          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
-                                          $<INSTALL_INTERFACE:include>)
   endif()
 
+  target_include_directories(OpenMeshTools PUBLIC
+                                        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
+                                        $<INSTALL_INTERFACE:include>)
+
 else ()
   vci_add_library (OpenMeshTools SHAREDANDSTATIC ${sources} ${headers})