[ros-diffs] [tkreuzer] 49846: [CMAKE] Fix dependencies for importlib targets

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Sun Nov 28 16:12:26 UTC 2010


Author: tkreuzer
Date: Sun Nov 28 16:12:25 2010
New Revision: 49846

URL: http://svn.reactos.org/svn/reactos?rev=49846&view=rev
Log:
[CMAKE]
Fix dependencies for importlib targets

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=49846&r1=49845&r2=49846&view=diff
==============================================================================
--- branches/cmake-bringup/msc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sun Nov 28 16:12:25 2010
@@ -164,13 +164,14 @@
     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 @@
         lib${_name}
         DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib
     )
+    
+    add_dependencies(lib${_name} asm ${_dependencies})
 endmacro()
 
 macro(add_importlibs MODULE)




More information about the Ros-diffs mailing list