Merge branch 'master' of https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free

OpenFlipper/PluginLib/CMakeLists.txt

@@ -26,8 +26,17 @@ foreach ( OF_PACKAGE ${OF_PACKAGES})
    list(APPEND PACKAGE_INCLUDES "${CMAKE_SOURCE_DIR}/${OF_PACKAGES}")
 endforeach ()
 
+
+# search all lib directories in packages for OpenFlipper
+file (
+    GLOB PACKAGE_DIRS
+      "${CMAKE_SOURCE_DIR}/Package-*"
+)
+
+
 include_directories (
   ..
+  ${PACKAGE_DIRS}
   ${OPENMESH_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}

OpenFlipper/cmake/plugin.cmake

@@ -455,8 +455,16 @@ function (_build_openflipper_plugin plugin)
       list(APPEND PACKAGE_INCLUDES "${CMAKE_SOURCE_DIR}/${OF_PACKAGES}")
     endforeach ()
 
+    # search all lib directories in packages for OpenFlipper
+  
+    file (
+        GLOB PACKAGE_DIRS
+          "${CMAKE_SOURCE_DIR}/Package-*"
+    )
+
     include_directories (
       .
+      ${PACKAGE_DIRS}
       ${CMAKE_SOURCE_DIR}
       ${OPENMESH_INCLUDE_DIRS}
       ${CMAKE_CURRENT_SOURCE_DIR}

cmake/FindIsoEx.cmake

@@ -12,8 +12,18 @@ IF (ISOEX_INCLUDE_DIRS)
   SET(ISOEX_FIND_QUIETLY TRUE)
 ENDIF (ISOEX_INCLUDE_DIRS)
 
+# search all lib directories in packages for OpenFlipper
+file (
+  GLOB _libdirs
+           "${CMAKE_SOURCE_DIR}/libs"
+           "${CMAKE_SOURCE_DIR}/Package-*/libs"
+)
+
+
+
 FIND_PATH( ISOEX_INCLUDE_DIRS IsoEx/Extractors/MarchingCubesT.hh
-           PATHS "${CMAKE_SOURCE_DIR}/libs" )
+           PATHS "${_libdirs}"
+                 "${CMAKE_SOURCE_DIR}/libs" )
 
 add_definitions (-DISOEXDLL -DUSEISOEX )