mirror of
https://github.com/reactos/reactos.git
synced 2024-12-29 02:25:17 +00:00
[CMAKE] Don't use the PCH for generated files.
The PCH must be used with the same compiler flags it was generated with, so don't use it for files that use modified flags.
This commit is contained in:
parent
545a2c7936
commit
5685ad4a12
7 changed files with 20 additions and 21 deletions
|
@ -11,7 +11,6 @@ list(APPEND SOURCE
|
|||
callback.c
|
||||
hlpfile.c
|
||||
macro.c
|
||||
macro.lex.yy.c
|
||||
winhelp.c
|
||||
precomp.h)
|
||||
|
||||
|
@ -19,9 +18,9 @@ list(APPEND SOURCE
|
|||
set_source_files_properties(macro.lex.yy.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"")
|
||||
|
||||
add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/winhelp.ico)
|
||||
add_executable(winhlp32 ${SOURCE} string.c rsrc.rc)
|
||||
add_executable(winhlp32 ${SOURCE} macro.lex.yy.c string.c rsrc.rc)
|
||||
set_module_type(winhlp32 win32gui)
|
||||
target_link_libraries(winhlp32 wine)
|
||||
add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll)
|
||||
#add_pch(winhlp32 precomp.h SOURCE)
|
||||
add_pch(winhlp32 precomp.h SOURCE)
|
||||
add_cd_file(TARGET winhlp32 DESTINATION reactos FOR all)
|
||||
|
|
|
@ -13,13 +13,9 @@ spec2def(d3dcompiler_43.dll d3dcompiler_43.spec ADD_IMPORTLIB)
|
|||
|
||||
list(APPEND SOURCE
|
||||
asmparser.c
|
||||
asmshader.tab.c
|
||||
asmshader.yy.c
|
||||
blob.c
|
||||
bytecodewriter.c
|
||||
compiler.c
|
||||
hlsl.tab.c
|
||||
hlsl.yy.c
|
||||
main.c
|
||||
reflection.c
|
||||
utils.c
|
||||
|
@ -28,6 +24,10 @@ list(APPEND SOURCE
|
|||
|
||||
add_library(d3dcompiler_43 MODULE
|
||||
${SOURCE}
|
||||
asmshader.tab.c
|
||||
asmshader.yy.c
|
||||
hlsl.tab.c
|
||||
hlsl.yy.c
|
||||
version.rc
|
||||
${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43.def)
|
||||
|
||||
|
@ -43,5 +43,5 @@ set_module_type(d3dcompiler_43 win32dll)
|
|||
target_link_libraries(d3dcompiler_43 dx10guid uuid wine wpp)
|
||||
add_importlibs(d3dcompiler_43 msvcrt kernel32 ntdll)
|
||||
add_dependencies(d3dcompiler_43 d3d_idl_headers)
|
||||
#add_pch(d3dcompiler_43 precomp.h SOURCE)
|
||||
add_pch(d3dcompiler_43 precomp.h SOURCE)
|
||||
add_cd_file(TARGET d3dcompiler_43 DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -10,7 +10,6 @@ list(APPEND SOURCE
|
|||
activex.c
|
||||
array.c
|
||||
bool.c
|
||||
cc_parser.tab.c
|
||||
compile.c
|
||||
date.c
|
||||
decode.c
|
||||
|
@ -29,7 +28,6 @@ list(APPEND SOURCE
|
|||
math.c
|
||||
number.c
|
||||
object.c
|
||||
parser.tab.c
|
||||
regexp.c
|
||||
string.c
|
||||
vbarray.c
|
||||
|
@ -48,6 +46,8 @@ set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${jscript_rc_deps
|
|||
|
||||
add_library(jscript MODULE
|
||||
${SOURCE}
|
||||
cc_parser.tab.c
|
||||
parser.tab.c
|
||||
rsrc.rc
|
||||
${CMAKE_CURRENT_BINARY_DIR}/jscript.def)
|
||||
|
||||
|
@ -57,5 +57,5 @@ add_dependencies(jscript jscript_idlheader stdole2)
|
|||
set_module_type(jscript win32dll)
|
||||
target_link_libraries(jscript uuid wine)
|
||||
add_importlibs(jscript user32 ole32 oleaut32 advapi32 msvcrt kernel32 ntdll)
|
||||
#add_pch(jscript precomp.h SOURCE)
|
||||
add_pch(jscript precomp.h SOURCE)
|
||||
add_cd_file(TARGET jscript DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -22,7 +22,6 @@ list(APPEND SOURCE
|
|||
assembly.c
|
||||
automation.c
|
||||
classes.c
|
||||
cond.tab.c
|
||||
create.c
|
||||
custom.c
|
||||
database.c
|
||||
|
@ -47,7 +46,6 @@ list(APPEND SOURCE
|
|||
script.c
|
||||
select.c
|
||||
source.c
|
||||
sql.tab.c
|
||||
storages.c
|
||||
streams.c
|
||||
string.c
|
||||
|
@ -64,6 +62,8 @@ set_source_files_properties(cond.tab.c sql.tab.c PROPERTIES COMPILE_FLAGS "-UREA
|
|||
|
||||
add_library(msi MODULE
|
||||
${SOURCE}
|
||||
cond.tab.c
|
||||
sql.tab.c
|
||||
${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c
|
||||
${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c
|
||||
msi.rc
|
||||
|
@ -84,5 +84,5 @@ add_importlibs(msi advapi32 advapi32_vista cabinet comctl32 gdi32 ole32 oleaut32
|
|||
kernel32
|
||||
ntdll)
|
||||
|
||||
#add_pch(msi precomp.h SOURCE)
|
||||
add_pch(msi precomp.h SOURCE)
|
||||
add_cd_file(TARGET msi DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -47,8 +47,6 @@ list(APPEND SOURCE
|
|||
xmlelem.c
|
||||
xmlparser.c
|
||||
xmlview.c
|
||||
xslpattern.tab.c
|
||||
xslpattern.yy.c
|
||||
precomp.h
|
||||
${CMAKE_CURRENT_BINARY_DIR}/msxml3_stubs.c)
|
||||
|
||||
|
@ -65,6 +63,8 @@ set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${msxml3_rc_de
|
|||
|
||||
add_library(msxml3 MODULE
|
||||
${SOURCE}
|
||||
xslpattern.tab.c
|
||||
xslpattern.yy.c
|
||||
factory.c
|
||||
uuid.c
|
||||
version.rc
|
||||
|
@ -75,5 +75,5 @@ set_module_type(msxml3 win32dll)
|
|||
target_link_libraries(msxml3 libxml2 iconv-static uuid wine zlib)
|
||||
add_importlibs(msxml3 urlmon ws2_32 shlwapi oleaut32 ole32 user32 msvcrt kernel32 ntdll)
|
||||
add_dependencies(msxml3 xmlparser_idlheader stdole2) # msxml3_v1.tlb needs stdole2.tlb
|
||||
#add_pch(msxml3 precomp.h SOURCE)
|
||||
add_pch(msxml3 precomp.h SOURCE)
|
||||
add_cd_file(TARGET msxml3 DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -8,7 +8,6 @@ list(APPEND SOURCE
|
|||
global.c
|
||||
interp.c
|
||||
lex.c
|
||||
parser.tab.c
|
||||
regexp.c
|
||||
utils.c
|
||||
vbdisp.c
|
||||
|
@ -35,6 +34,7 @@ add_typelib(vbsglobal.idl vbsregexp10.idl vbsregexp55.idl)
|
|||
|
||||
add_library(vbscript MODULE
|
||||
${SOURCE}
|
||||
parser.tab.c
|
||||
vbscript.rc
|
||||
${CMAKE_CURRENT_BINARY_DIR}/vbscript.def)
|
||||
|
||||
|
@ -42,5 +42,5 @@ set_module_type(vbscript win32dll)
|
|||
target_link_libraries(vbscript uuid wine)
|
||||
add_importlibs(vbscript oleaut32 ole32 user32 msvcrt kernel32 ntdll)
|
||||
add_dependencies(vbscript vbscript_idlheader stdole2)
|
||||
#add_pch(vbscript precomp.h SOURCE)
|
||||
add_pch(vbscript precomp.h SOURCE)
|
||||
add_cd_file(TARGET vbscript DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -19,7 +19,6 @@ list(APPEND SOURCE
|
|||
services.c
|
||||
table.c
|
||||
wbemlocator.c
|
||||
wql.tab.c
|
||||
precomp.h)
|
||||
|
||||
# wql.tab.c has been generated with relative file paths...
|
||||
|
@ -27,6 +26,7 @@ set_source_files_properties(wql.tab.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE
|
|||
|
||||
add_library(wbemprox MODULE
|
||||
${SOURCE}
|
||||
wql.tab.c
|
||||
guid.c
|
||||
wbemprox.rc
|
||||
${CMAKE_CURRENT_BINARY_DIR}/wbemprox.def)
|
||||
|
@ -36,5 +36,5 @@ set_module_type(wbemprox win32dll)
|
|||
target_link_libraries(wbemprox uuid wine)
|
||||
add_importlibs(wbemprox iphlpapi oleaut32 advapi32 user32 gdi32 version winspool ws2_32 rpcrt4 setupapi msvcrt kernel32 ntdll)
|
||||
add_dependencies(wbemprox d3d_idl_headers)
|
||||
#add_pch(wbemprox precomp.h SOURCE)
|
||||
add_pch(wbemprox precomp.h SOURCE)
|
||||
add_cd_file(TARGET wbemprox DESTINATION reactos/system32/wbem FOR all)
|
||||
|
|
Loading…
Reference in a new issue