From 1628f5e68271bd608fae0327ceced05deb18c6ff Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Fri, 9 Jan 2026 15:36:33 +0200 Subject: [PATCH] [CMAKE] Fix some dependencies on autogenerated headers --- dll/win32/mshtml.tlb/CMakeLists.txt | 2 +- dll/win32/stdole2.tlb/CMakeLists.txt | 2 +- dll/win32/stdole32.tlb/CMakeLists.txt | 2 +- media/themes/Blackshade/blackshade.msstyles/CMakeLists.txt | 4 ++-- media/themes/Lautus/lautus.msstyles/CMakeLists.txt | 2 +- media/themes/Lunar/lunar.msstyles/CMakeLists.txt | 2 +- media/themes/Mizu/mizu.msstyles/CMakeLists.txt | 2 +- media/themes/Modern/modern.msstyles/CMakeLists.txt | 2 +- sdk/lib/gcc_ssp/CMakeLists.txt | 5 +++++ 9 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dll/win32/mshtml.tlb/CMakeLists.txt b/dll/win32/mshtml.tlb/CMakeLists.txt index 03650c6190f..3c0dc00dbdf 100644 --- a/dll/win32/mshtml.tlb/CMakeLists.txt +++ b/dll/win32/mshtml.tlb/CMakeLists.txt @@ -6,7 +6,7 @@ list(APPEND mshtml_tlb_rc_deps ${CMAKE_CURRENT_BINARY_DIR}/mshtml_tlb.tlb ${CMAKE_CURRENT_SOURCE_DIR}/mshtml_tlb.rgs) -set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${mshtml_tlb_rc_deps}") +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${mshtml_tlb_rc_deps};xdk") set_module_type(mshtml.tlb module) set_target_properties(mshtml.tlb PROPERTIES SUFFIX "") add_dependencies(mshtml.tlb stdole2) diff --git a/dll/win32/stdole2.tlb/CMakeLists.txt b/dll/win32/stdole2.tlb/CMakeLists.txt index 6edf5211b29..e1206ad848d 100644 --- a/dll/win32/stdole2.tlb/CMakeLists.txt +++ b/dll/win32/stdole2.tlb/CMakeLists.txt @@ -6,7 +6,7 @@ list(APPEND SOURCE rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/stdole2.def) -set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/std_ole_v2.tlb) +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/std_ole_v2.tlb;xdk") add_library(stdole2.tlb MODULE ${SOURCE}) set_module_type(stdole2.tlb module) set_target_properties(stdole2.tlb PROPERTIES SUFFIX "") diff --git a/dll/win32/stdole32.tlb/CMakeLists.txt b/dll/win32/stdole32.tlb/CMakeLists.txt index 8b249ee9b6a..7b5a624980e 100644 --- a/dll/win32/stdole32.tlb/CMakeLists.txt +++ b/dll/win32/stdole32.tlb/CMakeLists.txt @@ -6,7 +6,7 @@ list(APPEND SOURCE rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def) -set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/std_ole_v1.tlb) +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/std_ole_v1.tlb;xdk") add_library(stdole32.tlb MODULE ${SOURCE}) set_module_type(stdole32.tlb module) set_target_properties(stdole32.tlb PROPERTIES SUFFIX "") diff --git a/media/themes/Blackshade/blackshade.msstyles/CMakeLists.txt b/media/themes/Blackshade/blackshade.msstyles/CMakeLists.txt index 52cb28e31a1..34d52c51a43 100644 --- a/media/themes/Blackshade/blackshade.msstyles/CMakeLists.txt +++ b/media/themes/Blackshade/blackshade.msstyles/CMakeLists.txt @@ -15,7 +15,7 @@ foreach(_file ${TEXTFILES}) list(APPEND _converted_files ${_converted_file}) endforeach() -set_source_files_properties(blackshade.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}") +set_source_files_properties(blackshade.rc PROPERTIES OBJECT_DEPENDS "${_converted_files};xdk") add_library(blackshade.msstyles MODULE blackshade.rc) set_module_type(blackshade.msstyles module) -set_target_properties(blackshade.msstyles PROPERTIES SUFFIX "") \ No newline at end of file +set_target_properties(blackshade.msstyles PROPERTIES SUFFIX "") diff --git a/media/themes/Lautus/lautus.msstyles/CMakeLists.txt b/media/themes/Lautus/lautus.msstyles/CMakeLists.txt index b4dda4fd840..397e36079ad 100644 --- a/media/themes/Lautus/lautus.msstyles/CMakeLists.txt +++ b/media/themes/Lautus/lautus.msstyles/CMakeLists.txt @@ -18,7 +18,7 @@ foreach(_file ${TEXTFILES}) list(APPEND _converted_files ${_converted_file}) endforeach() -set_source_files_properties(lautus.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}") +set_source_files_properties(lautus.rc PROPERTIES OBJECT_DEPENDS "${_converted_files};xdk") add_library(lautus.msstyles MODULE lautus.rc) set_module_type(lautus.msstyles module) set_target_properties(lautus.msstyles PROPERTIES SUFFIX "") diff --git a/media/themes/Lunar/lunar.msstyles/CMakeLists.txt b/media/themes/Lunar/lunar.msstyles/CMakeLists.txt index 9ec7b37272b..521a02ea8b3 100644 --- a/media/themes/Lunar/lunar.msstyles/CMakeLists.txt +++ b/media/themes/Lunar/lunar.msstyles/CMakeLists.txt @@ -14,7 +14,7 @@ foreach(_file ${TEXTFILES}) list(APPEND _converted_files ${_converted_file}) endforeach() -set_source_files_properties(lunar.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}") +set_source_files_properties(lunar.rc PROPERTIES OBJECT_DEPENDS "${_converted_files};xdk") add_library(lunar.msstyles MODULE lunar.rc) set_module_type(lunar.msstyles module) set_target_properties(lunar.msstyles PROPERTIES SUFFIX "") diff --git a/media/themes/Mizu/mizu.msstyles/CMakeLists.txt b/media/themes/Mizu/mizu.msstyles/CMakeLists.txt index 91807330a42..dcc32c45ee0 100644 --- a/media/themes/Mizu/mizu.msstyles/CMakeLists.txt +++ b/media/themes/Mizu/mizu.msstyles/CMakeLists.txt @@ -14,7 +14,7 @@ foreach(_file ${TEXTFILES}) list(APPEND _converted_files ${_converted_file}) endforeach() -set_source_files_properties(mizu.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}") +set_source_files_properties(mizu.rc PROPERTIES OBJECT_DEPENDS "${_converted_files};xdk") add_library(mizu.msstyles MODULE mizu.rc) set_module_type(mizu.msstyles module) set_target_properties(mizu.msstyles PROPERTIES SUFFIX "") diff --git a/media/themes/Modern/modern.msstyles/CMakeLists.txt b/media/themes/Modern/modern.msstyles/CMakeLists.txt index 59c0e0c245f..a02aa510c2b 100644 --- a/media/themes/Modern/modern.msstyles/CMakeLists.txt +++ b/media/themes/Modern/modern.msstyles/CMakeLists.txt @@ -19,7 +19,7 @@ foreach(_file ${TEXTFILES}) list(APPEND _converted_files ${_converted_file}) endforeach() -set_source_files_properties(modern.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}") +set_source_files_properties(modern.rc PROPERTIES OBJECT_DEPENDS "${_converted_files};xdk") add_library(modern.msstyles MODULE modern.rc) set_module_type(modern.msstyles module) set_target_properties(modern.msstyles PROPERTIES SUFFIX "") diff --git a/sdk/lib/gcc_ssp/CMakeLists.txt b/sdk/lib/gcc_ssp/CMakeLists.txt index 2e5a9e5bc0e..801360716d3 100644 --- a/sdk/lib/gcc_ssp/CMakeLists.txt +++ b/sdk/lib/gcc_ssp/CMakeLists.txt @@ -1,14 +1,19 @@ add_library(gcc_ssp_nt OBJECT gcc_ssp.c) +add_dependencies(gcc_ssp_nt xdk) add_library(gcc_ssp_msvcrt OBJECT gcc_ssp.c) target_compile_definitions(gcc_ssp_msvcrt PRIVATE _GCC_SSP_MSVCRT_) +add_dependencies(gcc_ssp_msvcrt xdk) add_library(gcc_ssp_win32k OBJECT gcc_ssp.c) target_compile_definitions(gcc_ssp_win32k PRIVATE _GCC_SSP_WIN32K_) +add_dependencies(gcc_ssp_win32k xdk) add_library(gcc_ssp_videoprt OBJECT gcc_ssp.c) target_compile_definitions(gcc_ssp_videoprt PRIVATE _GCC_SSP_VIDEOPRT_) +add_dependencies(gcc_ssp_videoprt xdk) add_library(gcc_ssp_scsiport OBJECT gcc_ssp.c) target_compile_definitions(gcc_ssp_scsiport PRIVATE _GCC_SSP_SCSIPORT_) +add_dependencies(gcc_ssp_scsiport xdk)