From 4da86123f490638682d8cd42c7b2f1f06015dffa Mon Sep 17 00:00:00 2001 From: Ahmed Arif Date: Mon, 18 May 2026 23:31:48 +0200 Subject: [PATCH] [MEDIA][CMAKE] Stop .msstyles and .tlb modules from rebuilding on every ninja invocation (#9003) Move 'xdk' from `OBJECT_DEPENDS` (which forces RC recompilation when xdk changes) to `add_dependencies()` at the target level (which only ensures build order without cascading into recompilation). This applies to all 5 theme msstyles (Lautus, Lunar, Mizu, Modern, Blackshade) and 3 TLB modules (stdole2, stdole32, mshtml). Addendum to commit 1628f5e682 (PR #8576). --- dll/win32/mshtml.tlb/CMakeLists.txt | 4 ++-- dll/win32/stdole2.tlb/CMakeLists.txt | 3 ++- dll/win32/stdole32.tlb/CMakeLists.txt | 3 ++- media/themes/Blackshade/blackshade.msstyles/CMakeLists.txt | 3 ++- media/themes/Lautus/lautus.msstyles/CMakeLists.txt | 3 ++- media/themes/Lunar/lunar.msstyles/CMakeLists.txt | 3 ++- media/themes/Mizu/mizu.msstyles/CMakeLists.txt | 3 ++- media/themes/Modern/modern.msstyles/CMakeLists.txt | 3 ++- 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dll/win32/mshtml.tlb/CMakeLists.txt b/dll/win32/mshtml.tlb/CMakeLists.txt index 3c0dc00dbdf..14afbba2d35 100644 --- a/dll/win32/mshtml.tlb/CMakeLists.txt +++ b/dll/win32/mshtml.tlb/CMakeLists.txt @@ -6,9 +6,9 @@ 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};xdk") +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${mshtml_tlb_rc_deps}") set_module_type(mshtml.tlb module) set_target_properties(mshtml.tlb PROPERTIES SUFFIX "") -add_dependencies(mshtml.tlb stdole2) +add_dependencies(mshtml.tlb stdole2 xdk) add_cd_file(TARGET mshtml.tlb DESTINATION reactos/system32 FOR all) set_wine_module(mshtml.tlb) diff --git a/dll/win32/stdole2.tlb/CMakeLists.txt b/dll/win32/stdole2.tlb/CMakeLists.txt index e1206ad848d..ed0ab44c8c9 100644 --- a/dll/win32/stdole2.tlb/CMakeLists.txt +++ b/dll/win32/stdole2.tlb/CMakeLists.txt @@ -6,9 +6,10 @@ 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;xdk") +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/std_ole_v2.tlb") add_library(stdole2.tlb MODULE ${SOURCE}) set_module_type(stdole2.tlb module) +add_dependencies(stdole2.tlb xdk) set_target_properties(stdole2.tlb PROPERTIES SUFFIX "") add_cd_file(TARGET stdole2.tlb DESTINATION reactos/system32 FOR all) set_wine_module(stdole2.tlb) diff --git a/dll/win32/stdole32.tlb/CMakeLists.txt b/dll/win32/stdole32.tlb/CMakeLists.txt index 7b5a624980e..b881b93a007 100644 --- a/dll/win32/stdole32.tlb/CMakeLists.txt +++ b/dll/win32/stdole32.tlb/CMakeLists.txt @@ -6,9 +6,10 @@ 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;xdk") +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/std_ole_v1.tlb") add_library(stdole32.tlb MODULE ${SOURCE}) set_module_type(stdole32.tlb module) +add_dependencies(stdole32.tlb xdk) set_target_properties(stdole32.tlb PROPERTIES SUFFIX "") add_cd_file(TARGET stdole32.tlb DESTINATION reactos/system32 FOR all) set_wine_module(stdole32.tlb) diff --git a/media/themes/Blackshade/blackshade.msstyles/CMakeLists.txt b/media/themes/Blackshade/blackshade.msstyles/CMakeLists.txt index 34d52c51a43..4e191466982 100644 --- a/media/themes/Blackshade/blackshade.msstyles/CMakeLists.txt +++ b/media/themes/Blackshade/blackshade.msstyles/CMakeLists.txt @@ -15,7 +15,8 @@ foreach(_file ${TEXTFILES}) list(APPEND _converted_files ${_converted_file}) endforeach() -set_source_files_properties(blackshade.rc PROPERTIES OBJECT_DEPENDS "${_converted_files};xdk") +set_source_files_properties(blackshade.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}") add_library(blackshade.msstyles MODULE blackshade.rc) set_module_type(blackshade.msstyles module) +add_dependencies(blackshade.msstyles xdk) 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 397e36079ad..b15558baf88 100644 --- a/media/themes/Lautus/lautus.msstyles/CMakeLists.txt +++ b/media/themes/Lautus/lautus.msstyles/CMakeLists.txt @@ -18,8 +18,9 @@ foreach(_file ${TEXTFILES}) list(APPEND _converted_files ${_converted_file}) endforeach() -set_source_files_properties(lautus.rc PROPERTIES OBJECT_DEPENDS "${_converted_files};xdk") +set_source_files_properties(lautus.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}") add_library(lautus.msstyles MODULE lautus.rc) set_module_type(lautus.msstyles module) +add_dependencies(lautus.msstyles xdk) set_target_properties(lautus.msstyles PROPERTIES SUFFIX "") add_cd_file(TARGET lautus.msstyles DESTINATION reactos/Resources/Themes/Lautus FOR all) diff --git a/media/themes/Lunar/lunar.msstyles/CMakeLists.txt b/media/themes/Lunar/lunar.msstyles/CMakeLists.txt index 521a02ea8b3..8428dd22154 100644 --- a/media/themes/Lunar/lunar.msstyles/CMakeLists.txt +++ b/media/themes/Lunar/lunar.msstyles/CMakeLists.txt @@ -14,8 +14,9 @@ foreach(_file ${TEXTFILES}) list(APPEND _converted_files ${_converted_file}) endforeach() -set_source_files_properties(lunar.rc PROPERTIES OBJECT_DEPENDS "${_converted_files};xdk") +set_source_files_properties(lunar.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}") add_library(lunar.msstyles MODULE lunar.rc) set_module_type(lunar.msstyles module) +add_dependencies(lunar.msstyles xdk) set_target_properties(lunar.msstyles PROPERTIES SUFFIX "") add_cd_file(TARGET lunar.msstyles DESTINATION reactos/Resources/Themes/Lunar FOR all) diff --git a/media/themes/Mizu/mizu.msstyles/CMakeLists.txt b/media/themes/Mizu/mizu.msstyles/CMakeLists.txt index dcc32c45ee0..6cb6ea8055a 100644 --- a/media/themes/Mizu/mizu.msstyles/CMakeLists.txt +++ b/media/themes/Mizu/mizu.msstyles/CMakeLists.txt @@ -14,8 +14,9 @@ foreach(_file ${TEXTFILES}) list(APPEND _converted_files ${_converted_file}) endforeach() -set_source_files_properties(mizu.rc PROPERTIES OBJECT_DEPENDS "${_converted_files};xdk") +set_source_files_properties(mizu.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}") add_library(mizu.msstyles MODULE mizu.rc) set_module_type(mizu.msstyles module) +add_dependencies(mizu.msstyles xdk) set_target_properties(mizu.msstyles PROPERTIES SUFFIX "") add_cd_file(TARGET mizu.msstyles DESTINATION reactos/Resources/Themes/Mizu FOR all) diff --git a/media/themes/Modern/modern.msstyles/CMakeLists.txt b/media/themes/Modern/modern.msstyles/CMakeLists.txt index a02aa510c2b..bf7d81715c3 100644 --- a/media/themes/Modern/modern.msstyles/CMakeLists.txt +++ b/media/themes/Modern/modern.msstyles/CMakeLists.txt @@ -19,8 +19,9 @@ foreach(_file ${TEXTFILES}) list(APPEND _converted_files ${_converted_file}) endforeach() -set_source_files_properties(modern.rc PROPERTIES OBJECT_DEPENDS "${_converted_files};xdk") +set_source_files_properties(modern.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}") add_library(modern.msstyles MODULE modern.rc) set_module_type(modern.msstyles module) +add_dependencies(modern.msstyles xdk) set_target_properties(modern.msstyles PROPERTIES SUFFIX "") add_cd_file(TARGET modern.msstyles DESTINATION reactos/Resources/Themes/Modern FOR all)