diff --git a/CMakeLists.txt b/CMakeLists.txt
index 032b4bbe..b8eb0f39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ if ( NOT DEFINED BUILD_APPS )
 endif()
 
 # Only call fixbundle, when we are building OpenMesh standalone
-if(${PROJECT_NAME} MATCHES "OpenMesh")
+if( (${PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS )
 
   if (WIN32)
     if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" AND BUILD_APPS )
diff --git a/src/OpenMesh/Core/CMakeLists.txt b/src/OpenMesh/Core/CMakeLists.txt
index f5474efc..28e0d1e0 100644
--- a/src/OpenMesh/Core/CMakeLists.txt
+++ b/src/OpenMesh/Core/CMakeLists.txt
@@ -53,16 +53,16 @@ else ()
 endif ()
 
 # Add core as dependency before fixbundle 
-if ( ${PROJECT_NAME} MATCHES "OpenMesh")
+if ( (${PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS )
 
-  if ( WIN32 AND BUILD_APPS)
+  if ( WIN32 )
     if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
       add_dependencies (fixbundle OpenMeshCore)
     endif()
   endif()
 
   # Add core as dependency before fixbundle 
-  if ( APPLE)
+  if ( APPLE )
     # let bundle generation depend on targets
     add_dependencies (fixbundle OpenMeshCore)
   endif ()
diff --git a/src/OpenMesh/Tools/CMakeLists.txt b/src/OpenMesh/Tools/CMakeLists.txt
index c94df5cf..c1969206 100644
--- a/src/OpenMesh/Tools/CMakeLists.txt
+++ b/src/OpenMesh/Tools/CMakeLists.txt
@@ -57,16 +57,15 @@ IF( NOT WIN32 )
   target_link_libraries (OpenMeshToolsStatic OpenMeshCoreStatic)
 ENDIF(NOT WIN32)
 
-if ( ${PROJECT_NAME} MATCHES "OpenMesh")
+if ( (${PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS )
 
-  if ( WIN32 AND BUILD_APPS)
+  if ( WIN32 )
     if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
       # let bundle generation depend on target
       add_dependencies (fixbundle OpenMeshTools)
     endif()
   endif()
 
-
   # Add tools as dependency before fixbundle 
   if (APPLE)
     # let bundle generation depend on target