[ros-diffs] [jgardou] 55777: [CMAKE] - fix MSVC build

Author: jgardou
Date: Tue Feb 21 14:56:36 2012
New Revision: 55777

URL: http://svn.reactos.org/svn/reactos?rev=55777&view=rev
Log:
[CMAKE]
 - fix MSVC build

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=55777…
==============================================================================
--- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue Feb 21 14:56:36 2012
@@ -133,7 +133,7 @@
 
 #define those for having real libraries
 set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "LINK /LIB /NOLOGO <LINK_FLAGS>
/OUT:<TARGET> <OBJECTS>")
-
+set(CMAKE_STUB_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> /Fo<OBJECT> /c
/Ta <SOURCE>")
 # Thanks MS for creating a stupid linker
 function(add_importlib_target _exports_file _implib_name)
 
@@ -145,7 +145,7 @@
         COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib
-n=${_implib_name} -d=${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_exp.def
-l=${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm
${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def)
     # be clear about the language
-    set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm
PROPERTIES LANGUAGE "ASM")
+    set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm
PROPERTIES LANGUAGE "STUB_ASM")
 
     # add our library
     # NOTE: as stub file and def file are generated in one pass, depending on one is like
depending on the other