diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index d01053ba1..7ed2a7d82 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -122,7 +122,7 @@ if(WINDOWS)
   add_custom_command(
     COMMENT "Copying prebuilt libraries to viewer executable directory"
     OUTPUT ${CMAKE_BINARY_DIR}/CopyWinLibs
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/CopyWinLibs.cmake
+    COMMAND ${CMAKE_COMMAND} -DCUR_CONFIG:STRING=${CMAKE_CFG_INTDIR} -P ${CMAKE_BINARY_DIR}/CopyWinLibs.cmake
     DEPENDS ${CMAKE_BINARY_DIR}/prepare/prebuilt ${CMAKE_BINARY_DIR}/CopyWinLibs.cmake
   	)
   add_custom_target(copy_win_libs DEPENDS ${CMAKE_BINARY_DIR}/CopyWinLibs)
diff --git a/indra/cmake/CopyWinLibs.cmake.in b/indra/cmake/CopyWinLibs.cmake.in
index 3b16a0bc7..1e7002dbe 100644
--- a/indra/cmake/CopyWinLibs.cmake.in
+++ b/indra/cmake/CopyWinLibs.cmake.in
@@ -23,6 +23,10 @@ set(LIBS_DEBUG_DIR
   )
 
 function(copy_files paths names dest)
+  string(FIND ${dest} ${CUR_CONFIG} idx)
+  if(${idx} LESS 0)
+    return()
+  endif(${idx} LESS 0)
   foreach(f ${names})
     foreach(p ${paths})
 	  set(from_file "${p}/${f}")