[CMAKE]

* Deduplicate add_importlibs.

svn path=/trunk/; revision=52211

diff --git a/reactos/cmake/CMakeMacros.cmake b/reactos/cmake/CMakeMacros.cmake
index 409937b..bca1385 100644 (file)
--- a/reactos/cmake/CMakeMacros.cmake
+++ b/reactos/cmake/CMakeMacros.cmake
@@ -226,3 +226,15 @@ else()
             DEPENDS ${_file2})
     endmacro()
 endif()
+
+macro(add_importlibs MODULE)
+    add_dependency_node(${MODULE})
+    foreach(LIB ${ARGN})
+        if ("${LIB}" MATCHES "msvcrt")
+            target_link_libraries(${MODULE} msvcrtex)
+        endif()
+        target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}${CMAKE_STATIC_LIBRARY_SUFFIX})
+        add_dependencies(${MODULE} lib${LIB})
+        add_dependency_edge(${MODULE} ${LIB})
+    endforeach()
+endmacro()

diff --git a/reactos/cmake/gcc.cmake b/reactos/cmake/gcc.cmake
index 85c7645..867c52b 100644 (file)
--- a/reactos/cmake/gcc.cmake
+++ b/reactos/cmake/gcc.cmake
@@ -207,19 +207,6 @@ set(IDL_PROXY_ARG -p -P)
 set(IDL_INTERFACE_ARG -u -o)
 set(IDL_DLLDATA_ARG --dlldata-only -o)
 
-
-macro(add_importlibs MODULE)
-    add_dependency_node(${MODULE})
-    foreach(LIB ${ARGN})
-        if ("${LIB}" MATCHES "msvcrt")
-            target_link_libraries(${MODULE} msvcrtex)
-        endif()
-        target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}.a)
-        add_dependencies(${MODULE} lib${LIB})
-        add_dependency_edge(${MODULE} ${LIB})
-    endforeach()
-endmacro()
-
 macro(add_delay_importlibs MODULE)
     foreach(LIB ${ARGN})
         target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}_delayed.a)

diff --git a/reactos/cmake/msvc.cmake b/reactos/cmake/msvc.cmake
index 768a1d8..e95d01d 100644 (file)
--- a/reactos/cmake/msvc.cmake
+++ b/reactos/cmake/msvc.cmake
@@ -158,16 +158,6 @@ macro(add_importlib_target _exports_file)
     add_dependencies(lib${_name} asm ${_dependencies})
 endmacro()
 
-macro(add_importlibs MODULE)
-    foreach(LIB ${ARGN})
-        if ("${LIB}" MATCHES "msvcrt")
-            target_link_libraries(${MODULE} msvcrtex)
-        endif()
-        target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}.lib)
-        add_dependencies(${MODULE} lib${LIB})
-    endforeach()
-endmacro()
-
 macro(add_delay_importlibs MODULE)
 # TODO
 endmacro()