mirror of
https://github.com/reactos/reactos.git
synced 2025-05-24 03:24:45 +00:00
[CMAKE]
- set PCH file after importing libraries for modules that link to msvcrt. Otherwise it wouldn't get the added definitions and become useless. svn path=/trunk/; revision=52369
This commit is contained in:
parent
13ac41ea5e
commit
4f2fbfda9d
18 changed files with 22 additions and 30 deletions
|
@ -6,8 +6,6 @@ list(APPEND SOURCE cacls.c cacls.rc)
|
|||
|
||||
add_executable(cacls ${SOURCE})
|
||||
|
||||
add_pch(cacls precomp.h)
|
||||
|
||||
set_module_type(cacls win32cui)
|
||||
add_importlibs(cacls advapi32 user32 shell32 msvcrt kernel32)
|
||||
add_cd_file(TARGET cacls DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -18,5 +18,5 @@ add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32)
|
|||
if(MSVC)
|
||||
add_importlibs(calc ntdll)
|
||||
endif()
|
||||
|
||||
add_pch(calc calc.h)
|
||||
add_cd_file(TARGET calc DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -11,10 +11,10 @@ list(APPEND SOURCE
|
|||
|
||||
add_executable(charmap ${SOURCE})
|
||||
|
||||
add_pch(charmap precomp.h)
|
||||
|
||||
set_module_type(charmap win32gui)
|
||||
|
||||
add_importlibs(charmap msvcrt user32 gdi32 comctl32 kernel32)
|
||||
|
||||
add_pch(charmap precomp.h)
|
||||
|
||||
add_cd_file(TARGET charmap DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -6,8 +6,7 @@ list(APPEND SOURCE
|
|||
|
||||
add_executable(logoff ${SOURCE})
|
||||
|
||||
add_pch(logoff precomp.h)
|
||||
|
||||
set_module_type(logoff win32cui)
|
||||
add_importlibs(logoff advapi32 user32 msvcrt kernel32)
|
||||
add_pch(logoff precomp.h)
|
||||
add_cd_file(TARGET logoff DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -26,10 +26,10 @@ list(APPEND SOURCE
|
|||
|
||||
add_executable(servman ${SOURCE})
|
||||
|
||||
add_pch(servman precomp.h)
|
||||
|
||||
set_module_type(servman win32gui)
|
||||
|
||||
add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32)
|
||||
|
||||
add_pch(servman precomp.h)
|
||||
|
||||
add_cd_file(TARGET servman DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -25,10 +25,10 @@ list(APPEND SOURCE
|
|||
|
||||
add_executable(mstsc ${SOURCE})
|
||||
|
||||
add_pch(mstsc precomp.h)
|
||||
|
||||
set_module_type(mstsc win32gui)
|
||||
|
||||
add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32)
|
||||
|
||||
add_pch(mstsc precomp.h)
|
||||
|
||||
add_cd_file(TARGET mstsc DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -22,14 +22,14 @@ list(APPEND SOURCE
|
|||
|
||||
add_executable(regedit ${SOURCE})
|
||||
|
||||
add_pch(regedit regedit.h)
|
||||
|
||||
set_module_type(regedit win32gui)
|
||||
|
||||
target_link_libraries(regedit uuid)
|
||||
|
||||
add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt kernel32)
|
||||
|
||||
add_pch(regedit regedit.h)
|
||||
|
||||
#add_subdirectory(clb)
|
||||
|
||||
add_cd_file(TARGET regedit DESTINATION reactos FOR all)
|
||||
|
|
|
@ -15,8 +15,7 @@ list(APPEND SOURCE
|
|||
|
||||
add_executable(sc ${SOURCE})
|
||||
|
||||
add_pch(sc sc.h)
|
||||
|
||||
set_module_type(sc win32cui)
|
||||
add_importlibs(sc advapi32 msvcrt kernel32)
|
||||
add_pch(sc sc.h)
|
||||
add_cd_file(TARGET sc DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -6,8 +6,7 @@ list(APPEND SOURCE
|
|||
|
||||
add_executable(shutdown ${SOURCE})
|
||||
|
||||
add_pch(shutdown precomp.h)
|
||||
|
||||
set_module_type(shutdown win32cui)
|
||||
add_importlibs(shutdown advapi32 user32 msvcrt kernel32)
|
||||
add_pch(shutdown precomp.h)
|
||||
add_cd_file(TARGET shutdown DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -10,8 +10,7 @@ list(APPEND SOURCE
|
|||
|
||||
add_executable(sndvol32 ${SOURCE})
|
||||
|
||||
add_pch(sndvol32 sndvol32.h)
|
||||
|
||||
set_module_type(sndvol32 win32gui)
|
||||
add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32 ntdll)
|
||||
add_pch(sndvol32 sndvol32.h)
|
||||
add_cd_file(TARGET sndvol32 DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -14,9 +14,9 @@ list(APPEND SOURCE
|
|||
|
||||
add_executable(tcpsvcs ${SOURCE})
|
||||
|
||||
add_pch(tcpsvcs tcpsvcs.h)
|
||||
set_module_type(tcpsvcs win32cui)
|
||||
add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt kernel32 ntdll)
|
||||
add_pch(tcpsvcs tcpsvcs.h)
|
||||
|
||||
|
||||
add_cd_file(TARGET tcpsvcs DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -76,7 +76,7 @@ add_executable(cmd ${SOURCE})
|
|||
|
||||
target_link_libraries(cmd wine)
|
||||
|
||||
add_pch(cmd precomp.h)
|
||||
set_module_type(cmd win32cui)
|
||||
add_importlibs(cmd advapi32 user32 msvcrt kernel32 ntdll)
|
||||
add_pch(cmd precomp.h)
|
||||
add_cd_file(TARGET cmd DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -22,7 +22,6 @@ add_executable(explorer_new ${SOURCE})
|
|||
|
||||
target_link_libraries(explorer_new uuid)
|
||||
|
||||
add_pch(explorer_new precomp.h)
|
||||
set_module_type(explorer_new win32gui)
|
||||
add_importlibs(explorer_new
|
||||
advapi32
|
||||
|
@ -37,5 +36,6 @@ add_importlibs(explorer_new
|
|||
msvcrt
|
||||
kernel32
|
||||
ntdll)
|
||||
add_pch(explorer_new precomp.h)
|
||||
|
||||
add_cd_file(TARGET explorer_new DESTINATION reactos FOR all)
|
||||
|
|
|
@ -12,8 +12,7 @@ add_executable(winlogon ${SOURCE})
|
|||
|
||||
target_link_libraries(winlogon wine)
|
||||
|
||||
add_pch(winlogon winlogon.h)
|
||||
|
||||
set_module_type(winlogon win32gui)
|
||||
add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt kernel32 ntdll)
|
||||
add_pch(winlogon winlogon.h)
|
||||
add_cd_file(TARGET winlogon DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -15,7 +15,7 @@ add_library(authz SHARED ${SOURCE})
|
|||
|
||||
set_module_type(authz win32dll)
|
||||
|
||||
add_pch(authz precomp.h)
|
||||
add_importlibs(authz advapi32 msvcrt kernel32 ntdll)
|
||||
add_pch(authz precomp.h)
|
||||
|
||||
add_cd_file(TARGET authz DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -20,7 +20,6 @@ add_library(msafd SHARED ${SOURCE})
|
|||
|
||||
set_module_type(msafd win32dll)
|
||||
|
||||
add_pch(msafd msafd.h)
|
||||
|
||||
add_importlibs(msafd advapi32 msvcrt kernel32 ntdll)
|
||||
add_pch(msafd msafd.h)
|
||||
add_cd_file(TARGET msafd DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -77,8 +77,6 @@ list(APPEND SOURCE
|
|||
|
||||
add_library(shell32 SHARED ${SOURCE})
|
||||
|
||||
add_pch(shell32 precomp.h)
|
||||
|
||||
set_module_type(shell32 win32dll)
|
||||
|
||||
target_link_libraries(shell32
|
||||
|
@ -101,6 +99,8 @@ add_importlibs(shell32
|
|||
kernel32
|
||||
msvcrt
|
||||
ntdll)
|
||||
|
||||
add_pch(shell32 precomp.h)
|
||||
|
||||
add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all)
|
||||
add_importlib_target(shell32.spec)
|
||||
|
|
|
@ -75,7 +75,7 @@ target_link_libraries(user32
|
|||
win32ksys
|
||||
${PSEH_LIB})
|
||||
|
||||
add_pch(user32 include/user32.h)
|
||||
add_importlibs(user32 gdi32 advapi32 imm32 msvcrt kernel32 ntdll)
|
||||
add_pch(user32 include/user32.h)
|
||||
add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all)
|
||||
add_importlib_target(user32.spec)
|
||||
|
|
Loading…
Reference in a new issue