Author: tkreuzer
Date: Fri Nov 19 10:54:05 2010
New Revision: 49621
URL:
http://svn.reactos.org/svn/reactos?rev=49621&view=rev
Log:
[CMAKE]
Fix typos in add_importlib_target macro, use /NOLOGO
Modified:
branches/cmake-bringup/msc.cmake
Modified: branches/cmake-bringup/msc.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=496…
==============================================================================
--- branches/cmake-bringup/msc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/msc.cmake [iso-8859-1] Fri Nov 19 10:54:05 2010
@@ -117,26 +117,27 @@
# Assemble the file
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj
- COMMAND ${CMAKE_ASM_COMPILER}
/Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta
${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm
+ COMMAND ${CMAKE_ASM_COMPILER} /NOLOGO
/Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta
${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm
DEPENDS "${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm"
)
# Add neccessary importlibs for redirections
+ set(_libraries "")
foreach(_lib ${ARGN})
list(APPEND _libraries "${CMAKE_BINARY_DIR}/importlibs/${_lib}.lib")
endforeach()
# Build the importlib
add_custom_command(
- OUTPUT {CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib
- COMMAND LINK /LIB /MACHINE:X86
/DEF:${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def
/OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib
${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj ${_libraries}
- DEPENDS "${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj"
"${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def" ${_libraries}
+ OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib
+ COMMAND LINK /LIB /NOLOGO /MACHINE:X86
/DEF:${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def
/OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib
${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj ${_libraries}
+ DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj
${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def ${_libraries}
)
# Add the importlib target
add_custom_target(
lib${_name}
- DEPENDS {CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib
+ DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib
)
endmacro()