From 777f58f75e15ee0128ea8d19cfe4814788d91479 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:14:33 +0100
Subject: [PATCH] Set include directories for tools and core per target and not
 globally

---
 src/OpenMesh/Core/CMakeLists.txt  | 23 ++++++++++++++----
 src/OpenMesh/Tools/CMakeLists.txt | 39 ++++++++++++++-----------------
 2 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/OpenMesh/Core/CMakeLists.txt b/src/OpenMesh/Core/CMakeLists.txt
index 7af0a558..977e2188 100644
--- a/src/OpenMesh/Core/CMakeLists.txt
+++ b/src/OpenMesh/Core/CMakeLists.txt
@@ -1,10 +1,5 @@
 include (VCICommon)
 
-include_directories (
-  ../..
-  ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
 set ( headers
 Geometry/Config.hh
 Geometry/EigenVectorT.hh
@@ -145,13 +140,31 @@ 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()
 
 else ()
   vci_add_library (OpenMeshCore SHAREDANDSTATIC ${sources} ${headers})
+
+  target_include_directories(OpenMeshCore PUBLIC
+                                          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
+                                          $<INSTALL_INTERFACE:include>)
+
+  target_include_directories(OpenMeshCoreStatic PUBLIC
+                                          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
+                                          $<INSTALL_INTERFACE:include>)
+
   set_target_properties (OpenMeshCore PROPERTIES VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
                                                SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} )
 endif ()
diff --git a/src/OpenMesh/Tools/CMakeLists.txt b/src/OpenMesh/Tools/CMakeLists.txt
index cf8e58fd..91e3b692 100644
--- a/src/OpenMesh/Tools/CMakeLists.txt
+++ b/src/OpenMesh/Tools/CMakeLists.txt
@@ -1,23 +1,5 @@
 include (VCICommon)
 
-include_directories (
-  ../..
-  ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-# source code directories
-set (directories 
-  . 
-  Decimater
-  Dualizer
-  Smoother
-  Subdivider/Adaptive/Composite
-  Subdivider/Uniform/Composite 
-  Subdivider/Uniform
-  Utils
-  VDPM
-)
-
 set ( headers  
 Decimater/BaseDecimaterT.hh
 Decimater/BaseDecimaterT_impl.hh
@@ -124,13 +106,30 @@ 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()
 
 else ()
   vci_add_library (OpenMeshTools SHAREDANDSTATIC ${sources} ${headers})
+
+  target_include_directories(OpenMeshTools PUBLIC
+                                          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
+                                          $<INSTALL_INTERFACE:include>)
+
+  target_include_directories(OpenMeshToolsStatic PUBLIC
+                                          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
+                                          $<INSTALL_INTERFACE:include>)
+
   set_target_properties (OpenMeshTools PROPERTIES VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
                                                 SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} )
 endif ()
@@ -208,10 +207,6 @@ install(FILES Utils/getopt.h DESTINATION include/OpenMesh/Tools/Utils)
 
 endif ()
 
-target_include_directories(OpenMeshTools PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
-  $<INSTALL_INTERFACE:include>)
-
 install(TARGETS OpenMeshTools EXPORT OpenMeshConfig
   ARCHIVE DESTINATION ${VCI_PROJECT_LIBDIR}
   LIBRARY DESTINATION ${VCI_PROJECT_LIBDIR}