diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24adc2201b517e1a767ce15deae656502dd5b01c..98978a34c04ac5aa4b638e0cdf43e7892e31027e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -245,7 +245,7 @@ if(HAVE_THREAD_LOCAL)
   add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL)
 endif()
 
-option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON)
+#option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON)
 if(FAIL_ON_WARNINGS)
   if(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
@@ -254,6 +254,10 @@ if(FAIL_ON_WARNINGS)
   endif()
 endif()
 
+if(MSVC)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+endif()
+
 option(WITH_ASAN "build with ASAN" OFF)
 if(WITH_ASAN)
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
diff --git a/gen-vs2017.bat b/gen-vs2017.bat
new file mode 100644
index 0000000000000000000000000000000000000000..2f36efaf9d714fef9cc92db4f2b72d5d22d7917b
--- /dev/null
+++ b/gen-vs2017.bat
@@ -0,0 +1,2 @@
+mkdir vs2017
+cmake CMAKE_SUPPRESS_REGENERATION=ON CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON FAIL_ON_WARNINGS=OFF -G "Visual Studio 15 2017 Win64" ..