diff --git a/CMakeLists.txt b/CMakeLists.txt
index f67582aa..ccba21c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.1)
 
 option(BUILD_TESTS "Build all tests" OFF)
 option(APPVEYOR_BUILD "Build on appveyor" OFF)
-option(WINDOWS_DEBUG "Build with debug window" OFF)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
diff --git a/appveyor.yml b/appveyor.yml
index 7fdeb8a5..6e8b6a2a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,7 +36,7 @@ build_script:
     - echo %INSTVERSION%
     - echo %DIST%
     - echo %DATE%
-    - cmake -G "Visual Studio 14 2015 Win64" -H. -Bbuild -DAPPVEYOR_BUILD=ON -DWINDOWS_DEBUG=OFF
+    - cmake -G "Visual Studio 14 2015 Win64" -H. -Bbuild -DAPPVEYOR_BUILD=ON
     - cmake --build build --config Release
 
 after_build:
diff --git a/cmake/QtCommon.cmake b/cmake/QtCommon.cmake
index 0725509f..cd93b351 100644
--- a/cmake/QtCommon.cmake
+++ b/cmake/QtCommon.cmake
@@ -57,7 +57,7 @@ macro(init_os_bundle)
 if (APPLE)
     set(OS_BUNDLE MACOSX_BUNDLE)
 elseif (WIN32)
-    if(NOT WINDOWS_DEBUG)
+    IF(CMAKE_BUILD_TYPE MATCHES RELEASE)
         set(OS_BUNDLE WIN32)
     endif()
 endif()