diff --git a/src/OpenMesh/Core/CMakeLists.txt b/src/OpenMesh/Core/CMakeLists.txt
index aa24a962..90901fcb 100644
--- a/src/OpenMesh/Core/CMakeLists.txt
+++ b/src/OpenMesh/Core/CMakeLists.txt
@@ -40,15 +40,17 @@ else ()
 
 endif ()
 
-# Add core as dependency before fixbundle 
-if ( WIN32 OR APPLE)
-  # let bundle generation depend on targets
-  add_dependencies (fixbundle OpenMeshCore)
-endif ()
+if ( ${PROJECT_NAME} MATCHES "OpenMesh")
+  # Add core as dependency before fixbundle 
+  if ( WIN32 OR APPLE)
+    # let bundle generation depend on targets
+    add_dependencies (fixbundle OpenMeshCore)
+  endif ()
 
-if ( APPLE)
-  # let bundle generation depend on target
-  add_dependencies (fixbundle OpenMeshToolsStatic)
+  if ( APPLE)
+    # let bundle generation depend on target
+    add_dependencies (fixbundle OpenMeshToolsStatic)
+  endif()
 endif()
 
 
diff --git a/src/OpenMesh/Tools/CMakeLists.txt b/src/OpenMesh/Tools/CMakeLists.txt
index 55d23815..9cf9cc74 100644
--- a/src/OpenMesh/Tools/CMakeLists.txt
+++ b/src/OpenMesh/Tools/CMakeLists.txt
@@ -47,15 +47,17 @@ IF( NOT WIN32 )
   target_link_libraries (OpenMeshToolsStatic OpenMeshCoreStatic)
 ENDIF(NOT WIN32)
 
-# Add tools as dependency before fixbundle 
-if ( WIN32 OR APPLE)
-  # let bundle generation depend on target
-  add_dependencies (fixbundle OpenMeshTools)
-endif()
+if ( ${PROJECT_NAME} MATCHES "OpenMesh")
+  # Add tools as dependency before fixbundle 
+  if ( WIN32 OR APPLE)
+    # let bundle generation depend on target
+    add_dependencies (fixbundle OpenMeshTools)
+  endif()
 
-if ( APPLE)
-  # let bundle generation depend on target
-  add_dependencies (fixbundle OpenMeshToolsStatic)
+  if ( APPLE)
+    # let bundle generation depend on target
+    add_dependencies (fixbundle OpenMeshToolsStatic)
+  endif()
 endif()