diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 9ad26ba9525..689ed60219f 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -34,12 +34,14 @@ if(UNIX)
     set(_setupvars_file setupvars/setupvars.sh)
 elseif(WIN32)
     set(_setupvars_file setupvars/setupvars.bat)
-    if (USE_BUILD_TYPE_SUBFOLDER AND CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE EQUAL "Debug")
+    if (USE_BUILD_TYPE_SUBFOLDER AND CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
         # Patch primary configuration in setupvars.bat which is "Release" by default.
         # Note setupvars secondary configuration is always "Debug".
+        message(STATUS "Patching content of ${_setupvars_file} for CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
         file(READ "${_setupvars_file}" _setupvars_content)
         string(REPLACE "Release" ${CMAKE_BUILD_TYPE} _setupvars_content "${_setupvars_content}")
         set(_setupvars_file "${CMAKE_BINARY_DIR}/${_setupvars_file}")
+        message(STATUS "Writing patched content to ${_setupvars_file}")
         file(WRITE "${_setupvars_file}" "${_setupvars_content}")
     endif()
 endif()