From 7cef73429ab4e90b1231a6f8e9088b89010ab328 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 28 Nov 2010 16:12:25 +0000 Subject: [PATCH] [CMAKE] Fix dependencies for importlib targets svn path=/branches/cmake-bringup/; revision=49846 --- msc.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msc.cmake b/msc.cmake index 0c0a5279a0f..603e781bcb8 100644 --- a/msc.cmake +++ b/msc.cmake @@ -164,13 +164,14 @@ macro(add_importlib_target _spec_file) set(_libraries "") foreach(_lib ${ARGN}) list(APPEND _libraries "${CMAKE_BINARY_DIR}/importlibs/${_lib}.lib") + list(APPEND _dependencies ${_lib}) endforeach() # Build the importlib add_custom_command( 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} + DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def ) # Add the importlib target @@ -178,6 +179,8 @@ macro(add_importlib_target _spec_file) lib${_name} DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib ) + + add_dependencies(lib${_name} asm ${_dependencies}) endmacro() macro(add_importlibs MODULE) -- 2.17.1