[ros-diffs] [jgardou] 55778: [CMAKE] - get rid of the no longer needed importlibs directory - exclude importlibs from all target in MSVC build

[jgardou]

Author: jgardou
Date: Tue Feb 21 15:03:19 2012
New Revision: 55778

URL: http://svn.reactos.org/svn/reactos?rev=55778&view=rev
Log:
[CMAKE]
 - get rid of the no longer needed importlibs directory
 - exclude importlibs from all target in MSVC build

Modified:
    trunk/reactos/CMakeLists.txt
    trunk/reactos/cmake/gcc.cmake
    trunk/reactos/cmake/msvc.cmake

Modified: trunk/reactos/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=55778&r1=55777&r2=55778&view=diff
==============================================================================
--- trunk/reactos/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/CMakeLists.txt [iso-8859-1] Tue Feb 21 15:03:19 2012
@@ -222,7 +222,5 @@
 
     file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos)
 
-    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
-
     add_dependency_footer()
 endif()

Modified: trunk/reactos/cmake/gcc.cmake
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=55778&r1=55777&r2=55778&view=diff
==============================================================================
--- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Tue Feb 21 15:03:19 2012
@@ -82,13 +82,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)
 

Modified: trunk/reactos/cmake/msvc.cmake
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=55778&r1=55777&r2=55778&view=diff
==============================================================================
--- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue Feb 21 15:03:19 2012
@@ -43,8 +43,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>")
 
@@ -149,7 +147,7 @@
 
     # 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 @@
     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")