[CMAKE]

Implement add_importlib_target macro to build importlibs for MSVC. We can't use MSVC's libraries, as they are incomplete.
gcc version does nothing.

svn path=/branches/cmake-bringup/; revision=49377

diff --git a/gcc.cmake b/gcc.cmake
index 40bb666..0317fa8 100644 (file)
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -157,4 +157,8 @@ set(IDL_TYPELIB_ARG -t -T) #.tlb
 set(IDL_SERVER_ARG -s -S) #.c for server library
 set(IDL_CLIENT_ARG -c -C) #.c for stub client library
 
-endif()
\ No newline at end of file
+macro(add_importlib_target _name)
+  # empty for now, while import libs are shipped
+endmacro()
+
+endif()

diff --git a/msc.cmake b/msc.cmake
index 5304db0..fe0d7b6 100644 (file)
--- a/msc.cmake
+++ b/msc.cmake
@@ -48,12 +48,6 @@ macro(set_image_base MODULE IMAGE_BASE)
     set_target_properties(${MODULE} PROPERTIES LINK_FLAGS ${NEW_LINKER_FLAGS})\r
 endmacro()\r
 \r
-macro(add_importlibs MODULE)\r
-    foreach(LIB ${ARGN})\r
-        target_link_libraries(${MODULE} ${LIB}.LIB)\r
-    endforeach()\r
-endmacro()\r
-\r
 macro(set_module_type MODULE TYPE)\r
     add_dependencies(${MODULE} psdk buildno_header)\r
     if(${TYPE} MATCHES nativecui)\r
@@ -87,4 +81,25 @@ set(IDL_TYPELIB_ARG /tlb) #.tlb
 set(IDL_SERVER_ARG /sstub) #.c for stub server library\r
 set(IDL_CLIENT_ARG /cstub) #.c for stub client library\r
 \r
-endif()
\ No newline at end of file
+\r
+macro(add_importlib_target _name)\r
+    add_custom_command(\r
+        OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib\r
+        COMMAND LINK /LIB /MACHINE:X86 /DEF:${CMAKE_CURRENT_BINARY_DIR}/${_name}.def /OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib\r
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_name}.def\r
+    )\r
+    add_custom_target(lib${_name}\r
+        DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib\r
+    )\r
+endmacro()\r
+\r
+macro(add_importlibs MODULE)\r
+    foreach(LIB ${ARGN})\r
+        target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}.lib)\r
+    endforeach()\r
+endmacro()\r
+\r
+file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)\r
+\r
+endif()\r
+\r