From 78412e7ca083c066ef4460d8f18afd427c32cede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= <jerome.gardou@reactos.org>
Date: Tue, 21 Feb 2012 15:03:19 +0000
Subject: [PATCH] [CMAKE]  - get rid of the no longer needed importlibs
 directory  - exclude importlibs from all target in MSVC build

svn path=/trunk/; revision=55778
---
 reactos/CMakeLists.txt   | 2 --
 reactos/cmake/gcc.cmake  | 7 -------
 reactos/cmake/msvc.cmake | 6 +-----
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/reactos/CMakeLists.txt b/reactos/CMakeLists.txt
index ad2a384799f..d7c23583a01 100644
--- a/reactos/CMakeLists.txt
+++ b/reactos/CMakeLists.txt
@@ -222,7 +222,5 @@ else()
 
     file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos)
 
-    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
-
     add_dependency_footer()
 endif()
diff --git a/reactos/cmake/gcc.cmake b/reactos/cmake/gcc.cmake
index 8507951bd34..ae8aeb38d2e 100644
--- a/reactos/cmake/gcc.cmake
+++ b/reactos/cmake/gcc.cmake
@@ -83,13 +83,6 @@ else()
     set(ARCH2 ${ARCH})
 endif()
 
-# Linking
-if(ARCH MATCHES i386)
-    link_directories(${REACTOS_SOURCE_DIR}/importlibs)
-endif()
-
-link_directories(${REACTOS_BINARY_DIR}/lib/sdk/crt)
-
 get_target_property(RSYM native-rsym IMPORTED_LOCATION_NOCONFIG)
 
 set(CMAKE_C_LINK_EXECUTABLE
diff --git a/reactos/cmake/msvc.cmake b/reactos/cmake/msvc.cmake
index 07cce1a1379..ec999981be1 100644
--- a/reactos/cmake/msvc.cmake
+++ b/reactos/cmake/msvc.cmake
@@ -44,8 +44,6 @@ else()
     set(SPEC2DEF_ARCH i386)
 endif()
 
-link_directories(${REACTOS_SOURCE_DIR}/importlibs ${REACTOS_BINARY_DIR}/importlibs ${REACTOS_BINARY_DIR}/lib/sdk/crt)
-
 set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>")
 
 if(MSVC_IDE)
@@ -149,7 +147,7 @@ function(add_importlib_target _exports_file _implib_name)
 
     # add our library
     # NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other
-    add_library(lib${_name} STATIC 
+    add_library(lib${_name} STATIC EXCLUDE_FROM_ALL
         ${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm)
     
     # Add necessary importlibs for redirections. Still necessary ?
@@ -188,8 +186,6 @@ macro(macro_mc FLAG FILE)
     set(COMMAND_MC mc ${FLAG} -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc)
 endmacro()
 
-file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
-
 #pseh workaround
 set(PSEH_LIB "pseh")