diff --git a/src/OpenMesh/Apps/CMakeLists.txt b/src/OpenMesh/Apps/CMakeLists.txt
index 59dca6ae..787a1734 100644
--- a/src/OpenMesh/Apps/CMakeLists.txt
+++ b/src/OpenMesh/Apps/CMakeLists.txt
@@ -23,20 +23,11 @@ if ( BUILD_APPS )
     add_subdirectory (VDProgMesh/Analyzer)
 
     # Add non ui apps as dependency before fixbundle 
-    if ( WIN32 )
-      if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
-	# let bundle generation depend on all targets
+    if ( APPLE OR (WIN32 AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) )
+        # let bundle generation depend on all targets
 	add_dependencies (fixbundle commandlineDecimater Dualizer mconvert Smoothing commandlineAdaptiveSubdivider commandlineSubdivider mkbalancedpm Analyzer )
-      endif()
     endif()
 
-    # Add non ui apps as dependency before fixbundle
-    if ( APPLE)
-      # let bundle generation depend on all targets
-      add_dependencies (fixbundle commandlineDecimater Dualizer mconvert Smoothing commandlineAdaptiveSubdivider commandlineSubdivider mkbalancedpm Analyzer )
-    endif()
-
-
     set( OpenGL_GL_PREFERENCE GLVND)
 
     # find needed packages for gui applications
diff --git a/src/OpenMesh/Core/CMakeLists.txt b/src/OpenMesh/Core/CMakeLists.txt
index ab741c44..48f55474 100644
--- a/src/OpenMesh/Core/CMakeLists.txt
+++ b/src/OpenMesh/Core/CMakeLists.txt
@@ -172,18 +172,10 @@ endif ()
 # Add core as dependency before fixbundle 
 if ( (${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS )
 
-  if ( WIN32 )
-    if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
+  if ( APPLE OR (WIN32 AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) )
       add_dependencies (fixbundle OpenMeshCore)
-    endif()
   endif()
 
-  # Add core as dependency before fixbundle 
-  if ( APPLE )
-    # let bundle generation depend on targets
-    add_dependencies (fixbundle OpenMeshCore)
-  endif ()
-
 endif()
 
 # if we build debug and release in the same dir, we want to install both!