From c1c1acb463d5979eaa1bdeadd0097bd519668569 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 13 Jun 2011 12:05:22 +0000
Subject: [PATCH] [CMAKE] * Deduplicate add_importlibs.

svn path=/trunk/; revision=52211
---
 reactos/cmake/CMakeMacros.cmake | 12 ++++++++++++
 reactos/cmake/gcc.cmake         | 13 -------------
 reactos/cmake/msvc.cmake        | 10 ----------
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/reactos/cmake/CMakeMacros.cmake b/reactos/cmake/CMakeMacros.cmake
index 409937b27b1..bca1385db43 100644
--- 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 85c764544e3..867c52b13d0 100644
--- 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 768a1d8654c..e95d01d590e 100644
--- 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()
-- 
2.17.1