From 823c30ef1f4d528450bb14a50ab1c87cf7b8fd8a Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Fri, 26 Aug 2011 17:33:33 +0000
Subject: [PATCH] [CMAKE] Fix compilation with VS x64

svn path=/trunk/; revision=53456
---
 reactos/cmake/msvc.cmake | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/reactos/cmake/msvc.cmake b/reactos/cmake/msvc.cmake
index 6c2d45210ad..c97d997fc9f 100644
--- a/reactos/cmake/msvc.cmake
+++ b/reactos/cmake/msvc.cmake
@@ -225,6 +225,13 @@ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
 #pseh workaround
 set(PSEH_LIB "pseh")
 
+# Use full path for ml when using x64 VS
+if((ARCH MATCHES amd64) AND ($ENV{VCINSTALLDIR}))
+    set(CMAKE_ASM16_COMPILER $ENV{VCINSTALLDIR}/bin/ml.exe)
+else()
+    set(CMAKE_ASM16_COMPILER ml.exe)
+endif()
+
 function(CreateBootSectorTarget2 _target_name _asm_file _binary_file _base_address)
 
     set(_object_file ${_binary_file}.obj)
@@ -237,7 +244,7 @@ function(CreateBootSectorTarget2 _target_name _asm_file _binary_file _base_addre
 
     add_custom_command(
         OUTPUT ${_object_file}
-        COMMAND ml /nologo /Cp /Fo${_object_file} /c /Ta ${_temp_file}
+        COMMAND ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_temp_file}
         DEPENDS ${_temp_file})
 
     add_custom_command(