Fix dependencies for importlib targets

svn path=/branches/cmake-bringup/; revision=49846
This commit is contained in:
Timo Kreuzer 2010-11-28 16:12:25 +00:00
parent 4592c1140e
commit 7cef73429a

View file

@ -164,13 +164,14 @@ macro(add_importlib_target _spec_file)
set(_libraries "") set(_libraries "")
foreach(_lib ${ARGN}) foreach(_lib ${ARGN})
list(APPEND _libraries "${CMAKE_BINARY_DIR}/importlibs/${_lib}.lib") list(APPEND _libraries "${CMAKE_BINARY_DIR}/importlibs/${_lib}.lib")
list(APPEND _dependencies ${_lib})
endforeach() endforeach()
# Build the importlib # Build the importlib
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib 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} 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} DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def
) )
# Add the importlib target # Add the importlib target
@ -178,6 +179,8 @@ macro(add_importlib_target _spec_file)
lib${_name} lib${_name}
DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib
) )
add_dependencies(lib${_name} asm ${_dependencies})
endmacro() endmacro()
macro(add_importlibs MODULE) macro(add_importlibs MODULE)