From: Thomas Faber Date: Sun, 27 Mar 2016 15:14:32 +0000 (+0000) Subject: [CMAKE] X-Git-Tag: ReactOS-0.4.1~163 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=d7dacbad475bf09836f33eec90374f42077406df [CMAKE] - Delay imports belong before regular imports because delayimp may pull in functions from kernel32 CORE-10935 svn path=/trunk/; revision=71061 --- diff --git a/reactos/base/applications/iexplore/CMakeLists.txt b/reactos/base/applications/iexplore/CMakeLists.txt index ed834e4e8d2..b92d69e08cf 100644 --- a/reactos/base/applications/iexplore/CMakeLists.txt +++ b/reactos/base/applications/iexplore/CMakeLists.txt @@ -3,6 +3,6 @@ add_rc_deps(iexplore.rc ${CMAKE_CURRENT_SOURCE_DIR}/iexplore.ico) add_executable(iexplore main.c iexplore.rc) target_link_libraries(iexplore wine) set_module_type(iexplore win32gui UNICODE) -add_importlibs(iexplore ieframe msvcrt kernel32 ntdll) add_delay_importlibs(iexplore advpack version) +add_importlibs(iexplore ieframe msvcrt kernel32 ntdll) add_cd_file(TARGET iexplore DESTINATION reactos FOR all) diff --git a/reactos/dll/cpl/appwiz/CMakeLists.txt b/reactos/dll/cpl/appwiz/CMakeLists.txt index 94f67834ce8..ea9a860e336 100644 --- a/reactos/dll/cpl/appwiz/CMakeLists.txt +++ b/reactos/dll/cpl/appwiz/CMakeLists.txt @@ -23,7 +23,7 @@ add_library(appwiz SHARED set_module_type(appwiz cpl UNICODE) target_link_libraries(appwiz uuid wine) -add_importlibs(appwiz urlmon ole32 comctl32 advapi32 shell32 user32 msvcrt kernel32 ntdll) add_delay_importlibs(appwiz msi) +add_importlibs(appwiz urlmon ole32 comctl32 advapi32 shell32 user32 msvcrt kernel32 ntdll) add_pch(appwiz appwiz.h SOURCE) add_cd_file(TARGET appwiz DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/cpl/inetcpl/CMakeLists.txt b/reactos/dll/cpl/inetcpl/CMakeLists.txt index c3f00f963f7..aee2dd2e1e4 100644 --- a/reactos/dll/cpl/inetcpl/CMakeLists.txt +++ b/reactos/dll/cpl/inetcpl/CMakeLists.txt @@ -20,7 +20,7 @@ add_library(inetcpl SHARED set_module_type(inetcpl cpl UNICODE) target_link_libraries(inetcpl wine) -add_importlibs(inetcpl advapi32 comctl32 user32 shlwapi msvcrt kernel32 ntdll) add_delay_importlibs(inetcpl cryptui wininet ole32 urlmon shell32) +add_importlibs(inetcpl advapi32 comctl32 user32 shlwapi msvcrt kernel32 ntdll) add_pch(inetcpl inetcpl.h SOURCE) add_cd_file(TARGET inetcpl DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/directx/wine/devenum/CMakeLists.txt b/reactos/dll/directx/wine/devenum/CMakeLists.txt index a7cd471d633..d62c95eb9d9 100644 --- a/reactos/dll/directx/wine/devenum/CMakeLists.txt +++ b/reactos/dll/directx/wine/devenum/CMakeLists.txt @@ -22,7 +22,7 @@ add_library(devenum SHARED set_source_files_properties(devenum.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/devenum_classes.rgs) set_module_type(devenum win32dll UNICODE) target_link_libraries(devenum strmiids uuid wine) -add_importlibs(devenum advapi32 advapi32_vista ole32 oleaut32 winmm user32 avicap32 msvcrt kernel32 ntdll) add_delay_importlibs(devenum msvfw32) +add_importlibs(devenum advapi32 advapi32_vista ole32 oleaut32 winmm user32 avicap32 msvcrt kernel32 ntdll) add_pch(devenum devenum_private.h SOURCE) add_cd_file(TARGET devenum DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/crypt32/CMakeLists.txt b/reactos/dll/win32/crypt32/CMakeLists.txt index 535b061fa71..8728bc60f0d 100644 --- a/reactos/dll/win32/crypt32/CMakeLists.txt +++ b/reactos/dll/win32/crypt32/CMakeLists.txt @@ -45,7 +45,7 @@ add_library(crypt32 SHARED set_module_type(crypt32 win32dll) target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames) -add_importlibs(crypt32 user32 advapi32 advapi32_vista msvcrt kernel32 ntdll) add_delay_importlibs(crypt32 cryptnet) +add_importlibs(crypt32 user32 advapi32 advapi32_vista msvcrt kernel32 ntdll) add_pch(crypt32 crypt32_private.h SOURCE) add_cd_file(TARGET crypt32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/msgina/CMakeLists.txt b/reactos/dll/win32/msgina/CMakeLists.txt index 9c7811acd9c..64f392d5cfc 100644 --- a/reactos/dll/win32/msgina/CMakeLists.txt +++ b/reactos/dll/win32/msgina/CMakeLists.txt @@ -22,7 +22,7 @@ add_library(msgina SHARED set_module_type(msgina win32dll) target_link_libraries(msgina wine) -add_importlibs(msgina advapi32 user32 gdi32 powrprof userenv msvcrt kernel32 ntdll) add_delay_importlibs(msgina secur32) +add_importlibs(msgina advapi32 user32 gdi32 powrprof userenv msvcrt kernel32 ntdll) add_pch(msgina msgina.h SOURCE) add_cd_file(TARGET msgina DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/netapi32/CMakeLists.txt b/reactos/dll/win32/netapi32/CMakeLists.txt index a7522fe3f0d..69a45cc2221 100644 --- a/reactos/dll/win32/netapi32/CMakeLists.txt +++ b/reactos/dll/win32/netapi32/CMakeLists.txt @@ -44,7 +44,7 @@ add_library(netapi32 SHARED set_module_type(netapi32 win32dll) target_link_libraries(netapi32 wine ${PSEH_LIB}) -add_importlibs(netapi32 iphlpapi ws2_32 advapi32 rpcrt4 msvcrt kernel32 ntdll) add_delay_importlibs(netapi32 samlib secur32) +add_importlibs(netapi32 iphlpapi ws2_32 advapi32 rpcrt4 msvcrt kernel32 ntdll) add_pch(netapi32 netapi32.h SOURCE) add_cd_file(TARGET netapi32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/ole32/CMakeLists.txt b/reactos/dll/win32/ole32/CMakeLists.txt index 72090d1d337..71819eaa4cc 100644 --- a/reactos/dll/win32/ole32/CMakeLists.txt +++ b/reactos/dll/win32/ole32/CMakeLists.txt @@ -80,8 +80,8 @@ add_library(ole32 SHARED set_module_type(ole32 win32dll) target_link_libraries(ole32 wine uuid ${PSEH_LIB}) -add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 kernel32_vista ntdll) add_delay_importlibs(ole32 oleaut32) +add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 kernel32_vista ntdll) add_dependencies(ole32 ole32idl) add_pch(ole32 precomp.h SOURCE) add_cd_file(TARGET ole32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/win32ss/user/winsrv/consrv_new.cmake b/reactos/win32ss/user/winsrv/consrv_new.cmake index 6d4f66abab3..7d841ba3fde 100644 --- a/reactos/win32ss/user/winsrv/consrv_new.cmake +++ b/reactos/win32ss/user/winsrv/consrv_new.cmake @@ -44,7 +44,7 @@ endif() add_library(consrv_new ${CONSRV_SOURCE}) #add_object_library(consrv_new ${CONSRV_SOURCE}) -add_importlibs(consrv_new psapi) # And the default ones from winsrv add_delay_importlibs(consrv_new ole32) # And the default ones from winsrv +add_importlibs(consrv_new psapi) # And the default ones from winsrv target_link_libraries(consrv_new uuid) # And the default ones from winsrv set_module_type(consrv_new module UNICODE) diff --git a/rostests/apitests/winhttp/CMakeLists.txt b/rostests/apitests/winhttp/CMakeLists.txt index 89b13d8c606..74058d6caf8 100644 --- a/rostests/apitests/winhttp/CMakeLists.txt +++ b/rostests/apitests/winhttp/CMakeLists.txt @@ -2,6 +2,6 @@ add_executable(winhttp_apitest WinHttpOpen.c testlist.c) target_link_libraries(winhttp_apitest wine) set_module_type(winhttp_apitest win32cui) -add_importlibs(winhttp_apitest msvcrt kernel32 ntdll) #add_delay_importlibs(winhttp_apitest winhttp) +add_importlibs(winhttp_apitest msvcrt kernel32 ntdll) add_cd_file(TARGET winhttp_apitest DESTINATION reactos/bin FOR all) diff --git a/rostests/apitests/wininet/CMakeLists.txt b/rostests/apitests/wininet/CMakeLists.txt index ea82885eaea..68e542397e7 100644 --- a/rostests/apitests/wininet/CMakeLists.txt +++ b/rostests/apitests/wininet/CMakeLists.txt @@ -2,6 +2,6 @@ add_executable(wininet_apitest InternetOpen.c testlist.c) target_link_libraries(wininet_apitest wine) set_module_type(wininet_apitest win32cui) -add_importlibs(wininet_apitest msvcrt kernel32 ntdll) #add_delay_importlibs(wininet_apitest wininet) +add_importlibs(wininet_apitest msvcrt kernel32 ntdll) add_cd_file(TARGET wininet_apitest DESTINATION reactos/bin FOR all)