diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc804660..0723c5d8 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,12 +151,12 @@ endif()
 # Only call fixbundle, when we are building OpenMesh standalone
 if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh")
 
-  if (WIN32 AND  BUILD_APPS)
+  if (WIN32 AND BUILD_APPS AND QT_FOUND)
     # prepare bundle generation cmake file and add a build target for it
     configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/cmake/fixbundle.cmake.win.in"
        "${CMAKE_CURRENT_BINARY_DIR}/fixbundle.win.cmake" @ONLY IMMEDIATE)
 
-    if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
+    if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles")
       # let bundle generation depend on all targets
       add_dependencies (fixbundle QtViewer DecimaterGui)
     endif()
@@ -164,7 +164,7 @@ if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh")
   endif()
  
   # On apple we do a fixbundle, which is only necessary for the apps and not for the libs
-  if (APPLE AND BUILD_APPS)
+  if (APPLE AND BUILD_APPSA AND QT_FOUND)
     # prepare bundle generation cmake file and add a build target for it
     configure_file ("${CMAKE_SOURCE_DIR}/cmake/fixbundle.cmake.in"
        "${CMAKE_BINARY_DIR}/fixbundle.cmake" @ONLY IMMEDIATE)