[llvm-commits] [llvm] r103727 - /llvm/trunk/lib/Target/X86/CMakeLists.txt

[Oscar Fuentes]

Author: ofv
Date: Thu May 13 14:34:06 2010
New Revision: 103727

URL: http://llvm.org/viewvc/llvm-project?rev=103727&view=rev
Log:
CMake: fixes 64 bit Visual Studio IDE build. Fixes bug 4936.

Patch by Dimitry Andric!

Modified:
    llvm/trunk/lib/Target/X86/CMakeLists.txt

Modified: llvm/trunk/lib/Target/X86/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/CMakeLists.txt?rev=103727&r1=103726&r2=103727&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/X86/CMakeLists.txt Thu May 13 14:34:06 2010
@@ -39,7 +39,12 @@
 
 if( CMAKE_CL_64 )
   enable_language(ASM_MASM)
-  set(sources ${sources} X86CompilationCallback_Win64.asm)
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/X86CompilationCallback_Win64.obj
+    COMMAND ${CMAKE_ASM_MASM_COMPILER} /Fo ${CMAKE_CURRENT_BINARY_DIR}/X86CompilationCallback_Win64.obj /c ${CMAKE_CURRENT_SOURCE_DIR}/X86CompilationCallback_Win64.asm
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/X86CompilationCallback_Win64.asm
+   )
+   set(sources ${sources} ${CMAKE_CURRENT_BINARY_DIR}/X86CompilationCallback_Win64.obj)
 endif()
 
 add_llvm_target(X86CodeGen ${sources})