[ros-diffs] [tkreuzer] 53456: [CMAKE] Fix compilation with VS x64

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Fri Aug 26 17:33:33 2011
New Revision: 53456

URL: http://svn.reactos.org/svn/reactos?rev=53456&view=rev
Log:
[CMAKE]
Fix compilation with VS x64

Modified:
    trunk/reactos/cmake/msvc.cmake

Modified: trunk/reactos/cmake/msvc.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=53456&r1=53455&r2=53456&view=diff
==============================================================================
--- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Fri Aug 26 17:33:33 2011
@@ -225,6 +225,13 @@
 #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 @@
 
     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(