diff --git a/src/OpenMesh/Core/CMakeLists.txt b/src/OpenMesh/Core/CMakeLists.txt
index 90901fcb..af0375fe 100644
--- a/src/OpenMesh/Core/CMakeLists.txt
+++ b/src/OpenMesh/Core/CMakeLists.txt
@@ -40,17 +40,20 @@ else ()
 
 endif ()
 
+# Add core as dependency before fixbundle 
 if ( ${PROJECT_NAME} MATCHES "OpenMesh")
   # Add core as dependency before fixbundle 
-  if ( WIN32 OR APPLE)
+
+  if ( WIN32 AND BUILD_APPS )
+    # let bundle generation depend on targets
+    add_dependencies (fixbundle OpenMeshCore)
+  endif()
+  
+  if ( APPLE)
     # let bundle generation depend on targets
     add_dependencies (fixbundle OpenMeshCore)
   endif ()
 
-  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 9cf9cc74..7db17c56 100644
--- a/src/OpenMesh/Tools/CMakeLists.txt
+++ b/src/OpenMesh/Tools/CMakeLists.txt
@@ -48,8 +48,15 @@ IF( NOT WIN32 )
 ENDIF(NOT WIN32)
 
 if ( ${PROJECT_NAME} MATCHES "OpenMesh")
+
+  if ( WIN32 AND BUILD_APPS )
+    # let bundle generation depend on target
+    add_dependencies (fixbundle OpenMeshTools)
+  endif()
+
+
   # Add tools as dependency before fixbundle 
-  if ( WIN32 OR APPLE)
+  if (APPLE)
     # let bundle generation depend on target
     add_dependencies (fixbundle OpenMeshTools)
   endif()