cmake fail on windows with latest llvm,cfe and lldb

Latest lldb fails here on Windows with the following error:

CMake Error at C:/Projects/oxygene-nougat-llvm/llvm/cmake/modules/AddLLVM.cmake:282 (set_output_directory):
   set_output_directory Function invoked with incorrect arguments for function
   named: set_output_directory
Call Stack (most recent call first):
   CMakeLists.txt:230 (llvm_add_library)
   source/Breakpoint/CMakeLists.txt:3 (add_lldb_library)

(for pretty much every CMakeLists.txt)

Looking at the source it *looks* like the lldb main cmake file needs this, like clang has too:

set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib)

Seems to work here but I don't know enough about cmake to be sure.