[ros-diffs] [hbelusca] 59480: [WINSRV] Fix a delayed-imports problem, catched by Timo and Thomas with a MSVC build. Caused by the fact that the static library consrv specified delayed imports for it, thinking ...

Author: hbelusca
Date: Sun Jul 14 11:33:26 2013
New Revision: 59480

URL: http://svn.reactos.org/svn/reactos?rev=59480&view=rev
Log:
[WINSRV]
Fix a delayed-imports problem, catched by Timo and Thomas with a MSVC build. Caused by the
fact that the static library consrv specified delayed imports for it, thinking that they
will be added to the list of delayed imports of winsrv. In fact it doesn't work and
those imports become real imports.

Modified:
    trunk/reactos/win32ss/user/winsrv/CMakeLists.txt
    trunk/reactos/win32ss/user/winsrv/consrv.cmake

Modified: trunk/reactos/win32ss/user/winsrv/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/CMakeL…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/CMakeLists.txt	[iso-8859-1] Sun Jul 14 11:33:26
2013
@@ -18,12 +18,13 @@
 
 # Add the components
 target_link_libraries(winsrv consrv usersrv)
-target_link_libraries(winsrv win32ksys ${PSEH_LIB}) # win32ksys because of NtUser...()
+# Add win32ksys because of NtUser...()
+target_link_libraries(winsrv win32ksys ${PSEH_LIB} ${CONSRV_TARGET_LINK_LIBS})
 
 set_module_type(winsrv win32dll UNICODE)
 
-add_importlibs(winsrv msvcrt kernel32 ntdll csrsrv)
-add_delay_importlibs(winsrv user32 gdi32 advapi32)
+add_importlibs(winsrv msvcrt kernel32 ntdll csrsrv ${CONSRV_IMPORT_LIBS})
+add_delay_importlibs(winsrv user32 gdi32 advapi32 ${CONSRV_DELAY_IMPORT_LIBS})
 
 add_dependencies(winsrv bugcodes)
 add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/win32ss/user/winsrv/consrv.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/consrv.cmake	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/consrv.cmake	[iso-8859-1] Sun Jul 14 11:33:26 2013
@@ -45,8 +45,8 @@
 add_library(consrv ${CONSRV_SOURCE})
 #add_object_library(consrv ${CONSRV_SOURCE})
 
-add_importlibs(consrv psapi)         # And the default ones from winsrv
-add_delay_importlibs(consrv ole32)   # And the default ones from winsrv
-target_link_libraries(consrv uuid)   # And the default ones from winsrv
+list(APPEND CONSRV_IMPORT_LIBS psapi)
+list(APPEND CONSRV_DELAY_IMPORT_LIBS ole32)
+list(APPEND CONSRV_TARGET_LINK_LIBS uuid)
 
 set_module_type(consrv module UNICODE)