Index: lib/Fuzzer/test/CMakeLists.txt
===================================================================
--- lib/Fuzzer/test/CMakeLists.txt
+++ lib/Fuzzer/test/CMakeLists.txt
@@ -124,10 +124,10 @@
   TraceMallocTest
   )
 
-if(APPLE)
-  # LeakSanitizer is not supported on OSX right now
+if(APPLE OR MSVC)
+  # LeakSanitizer is not supported on OSX and Windows right now
   set(HAS_LSAN 0)
-  message(WARNING "LeakSanitizer is not supported on Apple platforms."
+  message(WARNING "LeakSanitizer is not supported."
     " Building and running LibFuzzer LeakSanitizer tests is disabled."
     )
 else()
@@ -202,10 +202,10 @@
 
 set_output_directory(LLVMFuzzer-DSO1
     BINARY_DIR "${CMAKE_BINARY_DIR}/lib/Fuzzer/test"
-    LIBRARY_DIR "${CMAKE_BINARY_DIR}/lib/Fuzzer/lib")
+    LIBRARY_DIR "${CMAKE_BINARY_DIR}/lib/Fuzzer/test")
 set_output_directory(LLVMFuzzer-DSO2
     BINARY_DIR "${CMAKE_BINARY_DIR}/lib/Fuzzer/test"
-    LIBRARY_DIR "${CMAKE_BINARY_DIR}/lib/Fuzzer/lib")
+    LIBRARY_DIR "${CMAKE_BINARY_DIR}/lib/Fuzzer/test")
 
 set(TestBinaries ${TestBinaries} LLVMFuzzer-DSOTest)