[CMAKE] Implement PCH builds with target_precompile_headers. CORE-16905

modules/rostests/apitests/advapi32/CMakeLists.txt

@@ -17,12 +17,17 @@ list(APPEND SOURCE
     ServiceArgs.c
     ServiceEnv.c
     ServiceNetwork.c
-    svchlp.c
-    precomp.h)
+    svchlp.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(advapi32_apitest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE})
 
-add_executable(advapi32_apitest ${SOURCE} testlist.c)
 target_link_libraries(advapi32_apitest wine ${PSEH_LIB})
 set_module_type(advapi32_apitest win32cui)
 add_importlibs(advapi32_apitest advapi32 iphlpapi ws2_32 msvcrt kernel32 ntdll)
-add_pch(advapi32_apitest precomp.h SOURCE)
+add_pch(advapi32_apitest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET advapi32_apitest)

modules/rostests/apitests/afd/CMakeLists.txt

@@ -5,12 +5,17 @@ include_directories(
 list(APPEND SOURCE
     AfdHelpers.c
     send.c
-    windowsize.c
-    precomp.h)
+    windowsize.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(afd_apitest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE})
 
-add_executable(afd_apitest ${SOURCE} testlist.c)
 target_link_libraries(afd_apitest wine)
 set_module_type(afd_apitest win32cui)
 add_importlibs(afd_apitest ws2_32 msvcrt kernel32 ntdll)
-add_pch(afd_apitest precomp.h SOURCE)
+add_pch(afd_apitest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET afd_apitest)

modules/rostests/apitests/atl/CMakeLists.txt

@@ -19,16 +19,18 @@ list(APPEND SOURCE
     CRegKey.cpp
     CSimpleArray.cpp
     CSimpleMap.cpp
-    CString.cpp
-    precomp.h)
+    CString.cpp)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
 
 add_executable(atl_apitest
     ${SOURCE}
-    testlist.c
+    ${PCH_SKIP_SOURCE}
     atl_apitest.rc)
 
 target_link_libraries(atl_apitest wine uuid)
 set_module_type(atl_apitest win32cui)
 add_importlibs(atl_apitest rpcrt4 ole32 oleaut32 msimg32 gdi32 advapi32 user32 msvcrt kernel32 ntdll)
-add_pch(atl_apitest precomp.h SOURCE)
+add_pch(atl_apitest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET atl_apitest)

modules/rostests/apitests/cmd/CMakeLists.txt

@@ -1,11 +1,10 @@
 
 list(APPEND SOURCE
     cmd.c
-    precomp.h)
+    testlist.c)
 
-add_executable(cmd_apitest ${SOURCE} testlist.c)
+add_executable(cmd_apitest ${SOURCE})
 target_link_libraries(cmd_apitest wine ${PSEH_LIB})
 set_module_type(cmd_apitest win32cui)
 add_importlibs(cmd_apitest msvcrt kernel32)
-add_pch(cmd_apitest precomp.h SOURCE)
 add_rostests_file(TARGET cmd_apitest)

modules/rostests/apitests/com/CMakeLists.txt

@@ -3,19 +3,24 @@ add_definitions(-DWINE_NO_UNICODE_MACROS)
 
 list(APPEND SOURCE
     browseui.c
+    com_apitest.c
     ieframe.c
     netcfgx.c
     netshell.c
     ole32.c
     shdocvw.c
     shell32.c
-    zipfldr.c
-    com_apitest.c
-    com_apitest.h)
+    zipfldr.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(com_apitest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE})
 
-add_executable(com_apitest ${SOURCE} testlist.c)
 target_link_libraries(com_apitest wine uuid)
 set_module_type(com_apitest win32cui)
 add_importlibs(com_apitest advapi32 ole32 shlwapi shell32 msvcrt kernel32 ntdll)
-add_pch(com_apitest com_apitest.h SOURCE)
+add_pch(com_apitest com_apitest.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET com_apitest)

modules/rostests/apitests/gdi32/CMakeLists.txt

@@ -75,12 +75,18 @@ list(APPEND SOURCE
     SetWindowExtEx.c
     SetWorldTransform.c
     TextTransform.c
-    init.c
-    precomp.h)
+    init.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(gdi32_apitest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE}
+    resource.rc)
 
-add_executable(gdi32_apitest ${SOURCE} testlist.c resource.rc)
 target_link_libraries(gdi32_apitest ${PSEH_LIB} win32ksys)
 set_module_type(gdi32_apitest win32cui)
 add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll)
-add_pch(gdi32_apitest precomp.h SOURCE)
+add_pch(gdi32_apitest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET gdi32_apitest)

modules/rostests/apitests/kernel32/CMakeLists.txt

@@ -35,16 +35,22 @@ list(APPEND SOURCE
     SystemFirmware.c
     TerminateProcess.c
     TunnelCache.c
-    WideCharToMultiByte.c
-    precomp.h)
+    WideCharToMultiByte.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(kernel32_apitest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE}
+    kernel32_apitest.rc)
 
-add_executable(kernel32_apitest ${SOURCE} testlist.c kernel32_apitest.rc)
 target_link_libraries(kernel32_apitest wine ${PSEH_LIB})
 set_module_type(kernel32_apitest win32cui)
 add_delay_importlibs(kernel32_apitest advapi32 shlwapi)
 add_importlibs(kernel32_apitest msvcrt kernel32 ntdll)
 add_dependencies(kernel32_apitest FormatMessage)
-add_pch(kernel32_apitest precomp.h SOURCE)
+add_pch(kernel32_apitest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET kernel32_apitest)
 
 list(APPEND MANIFEST_FILES

modules/rostests/apitests/mountmgr/CMakeLists.txt

@@ -1,11 +1,17 @@
 
 list(APPEND SOURCE
-    QueryPoints.c
-    precomp.h)
+    QueryPoints.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(mountmgr_apitest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE})
 
-add_executable(mountmgr_apitest ${SOURCE} testlist.c)
 target_link_libraries(mountmgr_apitest wine ${PSEH_LIB})
 set_module_type(mountmgr_apitest win32cui)
 add_importlibs(mountmgr_apitest msvcrt kernel32 ntdll)
-add_pch(mountmgr_apitest precomp.h SOURCE)
+# TODO: Enable this when we get more than one source file to justify its use
+#add_pch(mountmgr_apitest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET mountmgr_apitest)

modules/rostests/apitests/ntdll/CMakeLists.txt

@@ -75,24 +75,28 @@ list(APPEND SOURCE
     RtlValidateUnicodeString.c
     StackOverflow.c
     SystemInfo.c
-    Timer.c
-    precomp.h)
+    Timer.c)
 
 if(ARCH STREQUAL "i386")
     add_asm_files(ntdll_apitest_asm i386/NtContinue.S)
 endif()
 
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
 add_rc_deps(testdata.rc ${CMAKE_CURRENT_BINARY_DIR}/load_notifications/load_notifications.dll)
+
 add_executable(ntdll_apitest
     ${SOURCE}
     ${ntdll_apitest_asm}
+    ${PCH_SKIP_SOURCE}
     testdata.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/ntdll_apitest.def
-    testlist.c)
+    ${CMAKE_CURRENT_BINARY_DIR}/ntdll_apitest.def)
+
 target_link_libraries(ntdll_apitest wine uuid ${PSEH_LIB})
 set_module_type(ntdll_apitest win32cui)
 add_importlibs(ntdll_apitest msvcrt advapi32 kernel32 ntdll)
-add_pch(ntdll_apitest precomp.h SOURCE)
+add_pch(ntdll_apitest precomp.h "${PCH_SKIP_SOURCE}")
 
 if(NOT MSVC)
     set_source_files_properties(RtlGetFullPathName_UstrEx.c PROPERTIES COMPILE_FLAGS "-Wno-format")

modules/rostests/apitests/shell32/CMakeLists.txt

@@ -34,19 +34,21 @@ list(APPEND SOURCE
     ShellState.cpp
     SHLimitInputEdit.cpp
     menu.cpp
-    shelltest.cpp
-    shelltest.h)
+    shelltest.cpp)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
 
 add_executable(shell32_apitest
     ${SOURCE}
-    testlist.c
+    ${PCH_SKIP_SOURCE}
     resource.rc
     ${CMAKE_CURRENT_BINARY_DIR}/shell32_apitest.def)
 
 target_link_libraries(shell32_apitest wine uuid ${PSEH_LIB})
 set_module_type(shell32_apitest win32cui)
 add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 advapi32 shlwapi msvcrt kernel32 ntdll)
-add_pch(shell32_apitest shelltest.h SOURCE)
+add_pch(shell32_apitest shelltest.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET shell32_apitest)
 
 # shell-notify.exe

modules/rostests/apitests/user32/CMakeLists.txt

@@ -46,14 +46,20 @@ list(APPEND SOURCE
     SystemParametersInfo.c
     TrackMouseEvent.c
     WndProc.c
-    wsprintf.c
-    precomp.h)
+    wsprintf.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(user32_apitest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE}
+    user32_apitest.rc)
 
-add_executable(user32_apitest ${SOURCE} testlist.c user32_apitest.rc)
 target_link_libraries(user32_apitest wine ${PSEH_LIB})
 set_module_type(user32_apitest win32cui)
 add_importlibs(user32_apitest advapi32 gdi32 user32 msvcrt kernel32 ntdll)
-add_pch(user32_apitest precomp.h SOURCE)
+add_pch(user32_apitest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET user32_apitest)
 
 add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/verclasstest1.manifest")

modules/rostests/apitests/win32nt/CMakeLists.txt

@@ -65,11 +65,14 @@ list(APPEND SOURCE
     ntuser/NtUserUpdatePerUserSystemParameters.c
 
     #osver.c
-    win32nt.h)
+    )
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
 
 add_executable(win32knt_apitest
     ${SOURCE}
-    testlist.c
+    ${PCH_SKIP_SOURCE}
     w32knapi.rc)
 
 target_link_libraries(win32knt_apitest ${PSEH_LIB} gditools)
@@ -84,5 +87,5 @@ add_importlibs(win32knt_apitest
     ntdll)
 add_delay_importlibs(win32knt_apitest win32u)
 add_dependencies(win32knt_apitest xdk)
-add_pch(win32knt_apitest win32nt.h SOURCE)
+add_pch(win32knt_apitest win32nt.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET win32knt_apitest)

modules/rostests/apitests/ws2_32/CMakeLists.txt

@@ -17,12 +17,17 @@ list(APPEND SOURCE
     WSAAsync.c
     WSAIoctl.c
     WSARecv.c
-    WSAStartup.c
-    ws2_32.h)
+    WSAStartup.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(ws2_32_apitest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE})
 
-add_executable(ws2_32_apitest ${SOURCE} testlist.c)
 target_link_libraries(ws2_32_apitest wine ${PSEH_LIB})
 set_module_type(ws2_32_apitest win32cui)
 add_importlibs(ws2_32_apitest advapi32 iphlpapi ws2_32 msvcrt kernel32 ntdll)
-add_pch(ws2_32_apitest ws2_32.h SOURCE)
+add_pch(ws2_32_apitest ws2_32.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET ws2_32_apitest)

modules/rostests/apitests/zipfldr/CMakeLists.txt

@@ -7,17 +7,18 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl)
 list(APPEND SOURCE
     EnumObjects.cpp
     EnumParentDir.cpp
-    IDataObject.cpp
-    precomp.h
-    resource.h)
+    IDataObject.cpp)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
 
 add_executable(zipfldr_apitest
     ${SOURCE}
-    testlist.c
+    ${PCH_SKIP_SOURCE}
     zipfldr_apitest.rc)
 
 target_link_libraries(zipfldr_apitest wine uuid)
 set_module_type(zipfldr_apitest win32cui)
 add_importlibs(zipfldr_apitest shlwapi ole32 shell32 user32 msvcrt kernel32 ntdll)
-add_pch(zipfldr_apitest precomp.h SOURCE)
+add_pch(zipfldr_apitest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET zipfldr_apitest)

modules/rostests/winetests/advapi32/CMakeLists.txt

@@ -12,10 +12,14 @@ list(APPEND SOURCE
     lsa.c
     registry.c
     security.c
-    service.c
-    precomp.h)
+    service.c)
 
-add_executable(advapi32_winetest ${SOURCE} testlist.c)
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(advapi32_winetest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE})
 
 if(USE_CLANG_CL OR (NOT MSVC))
     target_compile_options(advapi32_winetest PRIVATE "-Wno-format")
@@ -23,5 +27,5 @@ endif()
 
 set_module_type(advapi32_winetest win32cui)
 add_importlibs(advapi32_winetest advapi32 ole32 user32 msvcrt kernel32 ntdll)
-add_pch(advapi32_winetest precomp.h SOURCE)
+add_pch(advapi32_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET advapi32_winetest)

modules/rostests/winetests/comctl32/CMakeLists.txt

@@ -30,14 +30,16 @@ list(APPEND SOURCE
     tooltips.c
     trackbar.c
     treeview.c
-    updown.c
-    precomp.h)
+    updown.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    button.c
+    subclass.c
+    testlist.c)
 
 add_executable(comctl32_winetest
     ${SOURCE}
-    button.c
-    subclass.c
-    testlist.c
+    ${PCH_SKIP_SOURCE}
     rsrc.rc)
 
 if(USE_CLANG_CL OR (NOT MSVC))
@@ -51,5 +53,5 @@ if(MSVC)
     add_importlibs(comctl32_winetest ntdll)
 endif()
 
-add_pch(comctl32_winetest precomp.h SOURCE)
+add_pch(comctl32_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET comctl32_winetest)

modules/rostests/winetests/comdlg32/CMakeLists.txt

@@ -6,16 +6,18 @@ list(APPEND SOURCE
     finddlg.c
     fontdlg.c
     itemdlg.c
-    printdlg.c
-    precomp.h)
+    printdlg.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
 
 add_executable(comdlg32_winetest
     ${SOURCE}
-    testlist.c
+    ${PCH_SKIP_SOURCE}
     rsrc.rc)
 
 target_link_libraries(comdlg32_winetest uuid)
 set_module_type(comdlg32_winetest win32cui)
 add_importlibs(comdlg32_winetest comdlg32 winspool user32 gdi32 ole32 shell32 msvcrt kernel32)
-add_pch(comdlg32_winetest precomp.h SOURCE)
+add_pch(comdlg32_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET comdlg32_winetest)

modules/rostests/winetests/crypt32/CMakeLists.txt

@@ -16,11 +16,16 @@ list(APPEND SOURCE
     protectdata.c
     sip.c
     store.c
-    str.c
-    precomp.h)
+    str.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(crypt32_winetest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE})
 
-add_executable(crypt32_winetest ${SOURCE} testlist.c)
 set_module_type(crypt32_winetest win32cui)
 add_importlibs(crypt32_winetest crypt32 advapi32 user32 shlwapi shell32 msvcrt kernel32)
-add_pch(crypt32_winetest precomp.h SOURCE)
+add_pch(crypt32_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET crypt32_winetest)

modules/rostests/winetests/dinput/CMakeLists.txt

@@ -6,12 +6,17 @@ list(APPEND SOURCE
     dinput.c
     joystick.c
     keyboard.c
-    mouse.c
-    precomp.h)
+    mouse.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(dinput_winetest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE})
 
-add_executable(dinput_winetest ${SOURCE} testlist.c)
 target_link_libraries(dinput_winetest dinput_data_formats)
 set_module_type(dinput_winetest win32cui)
 add_importlibs(dinput_winetest dinput ole32 user32 msvcrt kernel32)
-add_pch(dinput_winetest precomp.h SOURCE)
+add_pch(dinput_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET dinput_winetest)

modules/rostests/winetests/dinput8/CMakeLists.txt

@@ -1,9 +1,19 @@
 
 add_definitions(-DUSE_WINE_TODOS )
-list(APPEND SOURCE device.c dinput.c precomp.h)
-add_executable(dinput8_winetest ${SOURCE} testlist.c)
+
+list(APPEND SOURCE
+    device.c
+    dinput.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(dinput8_winetest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE})
+
 target_link_libraries(dinput8_winetest dinput_data_formats)
 set_module_type(dinput8_winetest win32cui)
 add_importlibs(dinput8_winetest dinput8 ole32 user32 advapi32 msvcrt kernel32)
-add_pch(dinput8_winetest precomp.h SOURCE)
+add_pch(dinput8_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET dinput8_winetest)

modules/rostests/winetests/dsound/CMakeLists.txt

@@ -6,12 +6,17 @@ list(APPEND SOURCE
     dsound8.c
     dsound.c
     duplex.c
-    propset.c
-    dsound_test.h)
+    propset.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(dsound_winetest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE})
 
-add_executable(dsound_winetest ${SOURCE} testlist.c)
 target_link_libraries(dsound_winetest uuid dxguid)
 set_module_type(dsound_winetest win32cui)
 add_importlibs(dsound_winetest ole32 user32 msvcrt kernel32)
-add_pch(dsound_winetest dsound_test.h SOURCE)
+add_pch(dsound_winetest dsound_test.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET dsound_winetest)

modules/rostests/winetests/gdi32/CMakeLists.txt

@@ -15,12 +15,14 @@ list(APPEND SOURCE
     metafile.c
     palette.c
     path.c
-    pen.c
-    precomp.h)
+    pen.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
 
 add_executable(gdi32_winetest
     ${SOURCE}
-    testlist.c
+    ${PCH_SKIP_SOURCE}
     resource.rc)
 
 set_module_type(gdi32_winetest win32cui)
@@ -30,5 +32,5 @@ if(MSVC)
     add_importlibs(gdi32_winetest ntdll)
 endif()
 
-add_pch(gdi32_winetest precomp.h SOURCE)
+add_pch(gdi32_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET gdi32_winetest)

modules/rostests/winetests/gdiplus/CMakeLists.txt

@@ -18,16 +18,18 @@ list(APPEND SOURCE
     pathiterator.c
     pen.c
     region.c
-    stringformat.c
-    precomp.h)
+    stringformat.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    guid.c
+    testlist.c)
 
 add_executable(gdiplus_winetest
     ${SOURCE}
-    guid.c
-    testlist.c
+    ${PCH_SKIP_SOURCE}
     resource.rc)
 
 set_module_type(gdiplus_winetest win32cui)
 add_importlibs(gdiplus_winetest gdiplus user32 gdi32 ole32 msvcrt kernel32)
-add_pch(gdiplus_winetest precomp.h SOURCE)
+add_pch(gdiplus_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET gdiplus_winetest)

modules/rostests/winetests/kernel32/CMakeLists.txt

@@ -40,12 +40,14 @@ list(APPEND SOURCE
     toolhelp.c
     version.c
     virtual.c
-    volume.c
-    precomp.h)
+    volume.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
 
 add_executable(kernel32_winetest
     ${SOURCE}
-    testlist.c
+    ${PCH_SKIP_SOURCE}
     resource.rc)
 
 if(USE_CLANG_CL OR (NOT MSVC))
@@ -54,5 +56,5 @@ endif()
 
 set_module_type(kernel32_winetest win32cui)
 add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll)
-add_pch(kernel32_winetest precomp.h SOURCE)
+add_pch(kernel32_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET kernel32_winetest)

modules/rostests/winetests/mshtml/CMakeLists.txt

@@ -13,13 +13,15 @@ list(APPEND SOURCE
     protocol.c
     script.c
     style.c
-    xmlhttprequest.c
-    precomp.h)
+    xmlhttprequest.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    guid.c
+    testlist.c)
 
 add_executable(mshtml_winetest
     ${SOURCE}
-    guid.c
-    testlist.c
+    ${PCH_SKIP_SOURCE}
     rsrc.rc)
 
 list(APPEND mshtml_winetest_rc_deps
@@ -37,5 +39,5 @@ target_link_libraries(mshtml_winetest uuid strmiids)
 set_module_type(mshtml_winetest win32cui)
 add_importlibs(mshtml_winetest wininet ole32 oleaut32 user32 gdi32 urlmon advapi32 msvcrt kernel32)
 add_dependencies(mshtml_winetest test_tlb_header stdole2)
-add_pch(mshtml_winetest precomp.h SOURCE)
+add_pch(mshtml_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET mshtml_winetest)

modules/rostests/winetests/msi/CMakeLists.txt

@@ -29,8 +29,10 @@ list(APPEND SOURCE
     patch.c
     record.c
     source.c
-    suminfo.c
-    precomp.h)
+    suminfo.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
 
 if(NOT ${CMAKE_VERSION} VERSION_LESS "3.9.0")
     # CMake 3.9 and higher requires to specify this dependency manually
@@ -38,10 +40,14 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.9.0")
     set_property(SOURCE msi_winetest.rc PROPERTY OBJECT_DEPENDS custom.dll)
 endif()
 
-add_executable(msi_winetest ${SOURCE} testlist.c msi_winetest.rc)
+add_executable(msi_winetest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE}
+    msi_winetest.rc)
+
 target_link_libraries(msi_winetest uuid)
 set_module_type(msi_winetest win32cui)
 add_importlibs(msi_winetest cabinet msi shell32 ole32 oleaut32 user32 advapi32 version msvcrt kernel32)
-add_pch(msi_winetest precomp.h SOURCE)
+add_pch(msi_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET msi_winetest)
 add_dependencies(msi_winetest custom)

modules/rostests/winetests/msvcrt/CMakeLists.txt

@@ -22,10 +22,14 @@ list(APPEND SOURCE
     scanf.c
     signal.c
     string.c
-    time.c
-    precomp.h)
+    time.c)
 
-add_executable(msvcrt_winetest ${SOURCE} testlist.c)
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(msvcrt_winetest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE})
 
 if(USE_CLANG_CL OR (NOT MSVC))
     target_compile_options(msvcrt_winetest PRIVATE "-Wno-format")
@@ -39,5 +43,5 @@ if(MSVC)
     add_importlibs(msvcrt_winetest ntdll)
 endif()
 
-add_pch(msvcrt_winetest precomp.h SOURCE)
+add_pch(msvcrt_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET msvcrt_winetest)

modules/rostests/winetests/msxml3/CMakeLists.txt

@@ -10,13 +10,15 @@ list(APPEND SOURCE
     schema.c
     xmldoc.c
     xmlparser.c
-    xmlview.c
-    precomp.h)
+    xmlview.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    guid.c
+    testlist.c)
 
 add_executable(msxml3_winetest
     ${SOURCE}
-    guid.c
-    testlist.c
+    ${PCH_SKIP_SOURCE}
     rsrc.rc)
 
 add_idl_headers(xmlparser_idlheader_test xmlparser.idl)
@@ -28,5 +30,5 @@ if(MSVC)
     add_importlibs(msxml3_winetest ntdll)
 endif()
 
-add_pch(msxml3_winetest precomp.h SOURCE)
+add_pch(msxml3_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET msxml3_winetest)

modules/rostests/winetests/ntdll/CMakeLists.txt

@@ -21,8 +21,7 @@ list(APPEND SOURCE
     rtlbitmap.c
     rtlstr.c
     string.c
-    time.c
-    precomp.h)
+    time.c)
 
 if(ARCH STREQUAL "i386")
     list(APPEND SOURCE
@@ -30,7 +29,12 @@ if(ARCH STREQUAL "i386")
         generated.c)
 endif()
 
-add_executable(ntdll_winetest ${SOURCE} testlist.c)
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(ntdll_winetest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE})
 
 if(USE_CLANG_CL OR (NOT MSVC))
     target_compile_options(ntdll_winetest PRIVATE "-Wno-format")
@@ -38,5 +42,5 @@ endif()
 
 set_module_type(ntdll_winetest win32cui)
 add_importlibs(ntdll_winetest user32 ole32 advapi32 msvcrt kernel32 ntdll)
-add_pch(ntdll_winetest precomp.h SOURCE)
+add_pch(ntdll_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET ntdll_winetest)

modules/rostests/winetests/ole32/CMakeLists.txt

@@ -15,10 +15,15 @@ list(APPEND SOURCE
     propvariant.c
     stg_prop.c
     storage32.c
-    usrmarshal.c
-    precomp.h)
+    usrmarshal.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(ole32_winetest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE})
 
-add_executable(ole32_winetest ${SOURCE} testlist.c)
 target_link_libraries(ole32_winetest uuid)
 set_module_type(ole32_winetest win32cui)
 add_importlibs(ole32_winetest oleaut32 ole32 user32 gdi32 advapi32 msvcrt kernel32)
@@ -27,5 +32,5 @@ if(MSVC)
     add_importlibs(ole32_winetest ntdll)
 endif()
 
-add_pch(ole32_winetest precomp.h SOURCE)
+add_pch(ole32_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET ole32_winetest)

modules/rostests/winetests/oleaut32/CMakeLists.txt

@@ -23,8 +23,10 @@ list(APPEND SOURCE
     vartype.c
     ${CMAKE_CURRENT_BINARY_DIR}/test_reg_i.c
     ${CMAKE_CURRENT_BINARY_DIR}/test_tlb_i.c
-    ${CMAKE_CURRENT_BINARY_DIR}/tmarshal_i.c
-    precomp.h)
+    ${CMAKE_CURRENT_BINARY_DIR}/tmarshal_i.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
 
 set(tmarshal.rc_DEPS
     ${CMAKE_CURRENT_BINARY_DIR}/test_reg.tlb
@@ -32,7 +34,12 @@ set(tmarshal.rc_DEPS
     ${CMAKE_CURRENT_BINARY_DIR}/tmarshal.tlb)
 
 set_source_files_properties(tmarshal.rc PROPERTIES OBJECT_DEPENDS "${tmarshal.rc_DEPS}")
-add_executable(oleaut32_winetest ${SOURCE} testlist.c tmarshal.rc)
+
+add_executable(oleaut32_winetest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE}
+    tmarshal.rc)
+
 target_link_libraries(oleaut32_winetest uuid)
 set_module_type(oleaut32_winetest win32cui)
 add_importlibs(oleaut32_winetest oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32)
@@ -42,5 +49,5 @@ if(MSVC)
 endif()
 
 add_dependencies(oleaut32_winetest stdole2 oleaut32_idlheaders)
-add_pch(oleaut32_winetest precomp.h SOURCE)
+add_pch(oleaut32_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET oleaut32_winetest)

modules/rostests/winetests/shell32/CMakeLists.txt

@@ -26,12 +26,14 @@ list(APPEND SOURCE
     shlfolder.c
     shlview.c
     string.c
-    systray.c
-    precomp.h)
+    systray.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
 
 add_executable(shell32_winetest
     ${SOURCE}
-    testlist.c
+    ${PCH_SKIP_SOURCE}
     rsrc.rc)
 
 target_link_libraries(shell32_winetest uuid)
@@ -42,5 +44,5 @@ if(MSVC)
     add_importlibs(shell32_winetest ntdll)
 endif()
 
-add_pch(shell32_winetest precomp.h SOURCE)
+add_pch(shell32_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET shell32_winetest)

modules/rostests/winetests/shlwapi/CMakeLists.txt

@@ -14,10 +14,15 @@ list(APPEND SOURCE
     shreg.c
     string.c
     thread.c
-    url.c
-    precomp.h)
+    url.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
+
+add_executable(shlwapi_winetest
+    ${SOURCE}
+    ${PCH_SKIP_SOURCE})
 
-add_executable(shlwapi_winetest ${SOURCE} testlist.c)
 target_link_libraries(shlwapi_winetest uuid)
 set_module_type(shlwapi_winetest win32cui)
 add_importlibs(shlwapi_winetest shlwapi shell32 mlang oleaut32 ole32 user32 advapi32 msvcrt kernel32)
@@ -26,5 +31,5 @@ if(MSVC)
     add_importlibs(shlwapi_winetest ntdll)
 endif()
 
-add_pch(shlwapi_winetest precomp.h SOURCE)
+add_pch(shlwapi_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET shlwapi_winetest)

modules/rostests/winetests/user32/CMakeLists.txt

@@ -34,15 +34,17 @@ list(APPEND SOURCE
     uitools.c
     win.c
     winstation.c
-    wsprintf.c
-    precomp.h)
+    wsprintf.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    testlist.c)
 
 add_executable(user32_winetest
     ${SOURCE}
-    testlist.c
+    ${PCH_SKIP_SOURCE}
     resource.rc)
 
-add_pch(user32_winetest precomp.h SOURCE)
+add_pch(user32_winetest precomp.h "${PCH_SKIP_SOURCE}")
 # some tests need to be run from an app compiled as GUI
 set_module_type(user32_winetest win32gui)
 add_importlibs(user32_winetest user32 gdi32 advapi32 msvcrt kernel32)

modules/rostests/winetests/windowscodecs/CMakeLists.txt

@@ -16,13 +16,15 @@ list(APPEND SOURCE
     pngformat.c
     propertybag.c
     stream.c
-    tiffformat.c
-    precomp.h)
+    tiffformat.c)
+
+list(APPEND PCH_SKIP_SOURCE
+    guid.c
+    testlist.c)
 
 add_executable(windowscodecs_winetest
     ${SOURCE}
-    guid.c
-    testlist.c)
+    ${PCH_SKIP_SOURCE})
 
 set_module_type(windowscodecs_winetest win32cui)
 add_importlibs(windowscodecs_winetest windowscodecs oleaut32 ole32 propsys user32 gdi32 shlwapi msvcrt kernel32)
@@ -31,5 +33,5 @@ if(MSVC)
     add_importlibs(windowscodecs_winetest ntdll)
 endif()
 
-add_pch(windowscodecs_winetest precomp.h SOURCE)
+add_pch(windowscodecs_winetest precomp.h "${PCH_SKIP_SOURCE}")
 add_rostests_file(TARGET windowscodecs_winetest)