diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 5e62bb245dc67698346688bc5f831fde13ea2c79..a698d2206f948bed5b9886ac377668cb744efc4c 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -157,6 +157,16 @@ if (WINDOWS)
     add_compile_options(/arch:SSE2)
   endif ()
 
+  option(FAVOR_AMD "Favor amd64 processors in generated code" OFF)
+  option(FAVOR_INTEL "Favor intel64 processors in generated code" OFF)
+  if(FAVOR_AMD AND FAVOR_INTEL)
+    message(FATAL_ERROR "Cannot enable favor intel and amd at the same time")
+  elseif(FAVOR_AMD)
+    add_compile_options(/favor:AMD64)
+  elseif(FAVOR_INTEL)
+    add_compile_options(/favor:INTEL64)
+  endif()
+
   if (NOT VS_DISABLE_FATAL_WARNINGS)
     add_compile_options(/WX)
   endif (NOT VS_DISABLE_FATAL_WARNINGS)