diff --git a/cmake/Codegen.cmake b/cmake/Codegen.cmake
index f8fdcc8be71..f292a97fec2 100644
--- a/cmake/Codegen.cmake
+++ b/cmake/Codegen.cmake
@@ -53,16 +53,14 @@ install(FILES ${CMAKE_BINARY_DIR}/caffe2/core/macros.h
 
 # ---[ ATen specific
 if (INTERN_BUILD_ATEN_OPS)
-  SET(OPT_FLAG "-O3 ")
   IF(MSVC)
-    SET(OPT_FLAG "/Ox /fp:strict ")
-  ENDIF()
-  SET(VCOMP_LIB "vcomp")
-
-  IF("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
-    SET(OPT_FLAG " ")
-    SET(VCOMP_LIB "vcompd")
-  ENDIF()
+    SET(OPT_FLAG "/fp:strict ")
+  ELSE(MSVC)
+    SET(OPT_FLAG "-O3 ")
+    IF("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
+      SET(OPT_FLAG " ")
+    ENDIF()
+  ENDIF(MSVC)
 
   IF(C_AVX_FOUND)
     IF(MSVC)
diff --git a/cmake/public/utils.cmake b/cmake/public/utils.cmake
index eca8bd372cc..63484b323cb 100644
--- a/cmake/public/utils.cmake
+++ b/cmake/public/utils.cmake
@@ -305,8 +305,14 @@ endfunction()
 #   torch_set_target_props(lib_name)
 function(torch_set_target_props libname)
   if(MSVC AND AT_MKL_MT)
+    set(VCOMP_LIB "vcomp")
+    set_target_properties(${libname} PROPERTIES LINK_FLAGS_MINSIZEREL "/NODEFAULTLIB:${VCOMP_LIB}")
+    set_target_properties(${libname} PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/NODEFAULTLIB:${VCOMP_LIB}")
     set_target_properties(${libname} PROPERTIES LINK_FLAGS_RELEASE "/NODEFAULTLIB:${VCOMP_LIB}")
-    set_target_properties(${libname} PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:${VCOMP_LIB}")
-    set_target_properties(${libname} PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB:${VCOMP_LIB}")
+    set_target_properties(${libname} PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:${VCOMP_LIB}d")
+    set_target_properties(${libname} PROPERTIES STATIC_LIBRARY_FLAGS_MINSIZEREL "/NODEFAULTLIB:${VCOMP_LIB}")
+    set_target_properties(${libname} PROPERTIES STATIC_LIBRARY_FLAGS_RELWITHDEBINFO "/NODEFAULTLIB:${VCOMP_LIB}")
+    set_target_properties(${libname} PROPERTIES STATIC_LIBRARY_FLAGS_RELEASE "/NODEFAULTLIB:${VCOMP_LIB}")
+    set_target_properties(${libname} PROPERTIES STATIC_LIBRARY_FLAGS_DEBUG "/NODEFAULTLIB:${VCOMP_LIB}d")
   endif()
 endfunction()