From 14d9d4e8bb50dbcff65e2544305fb253bd9cdb72 Mon Sep 17 00:00:00 2001 From: David Racine Date: Thu, 13 Aug 2026 07:26:37 -0400 Subject: [PATCH] Pick up newly added source files without a manual re-configure (#7060) The source globs did not use CONFIGURE_DEPENDS, so adding a file under soh/ or src/ left it out of the build until cmake was re-run by hand, silently and with no warning. Co-authored-by: Claude Opus 5 --- soh/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt index 0709642a40..1924934727 100644 --- a/soh/CMakeLists.txt +++ b/soh/CMakeLists.txt @@ -117,7 +117,7 @@ set(Header_Files "resource.h") source_group("headers" FILES ${Header_Files}) # include {{{ -file(GLOB Header_Files__include "include/*.h" "include/*.inc") +file(GLOB Header_Files__include CONFIGURE_DEPENDS "include/*.h" "include/*.inc") list(APPEND Header_Files__include ${CMAKE_CURRENT_SOURCE_DIR}/include/libc/stdarg.h) list(REMOVE_ITEM Header_Files__include ${CMAKE_CURRENT_SOURCE_DIR}/include/bgm.h) list(REMOVE_ITEM Header_Files__include ${CMAKE_CURRENT_SOURCE_DIR}/include/math_n64.h) @@ -129,7 +129,7 @@ source_group("include" FILES ${Header_Files__include}) # }}} # soh (root) -file(GLOB_RECURSE soh__ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "soh/*.c" "soh/*.cpp" "soh/*.h" "soh/*.hpp") +file(GLOB_RECURSE soh__ CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "soh/*.c" "soh/*.cpp" "soh/*.h" "soh/*.hpp") # Add specific files that don't match the pattern list(APPEND soh__ ${CMAKE_CURRENT_SOURCE_DIR}/soh/Enhancements/speechsynthesizer/DarwinSpeechSynthesizer.mm) @@ -167,14 +167,14 @@ endif() list(FILTER ship__ EXCLUDE REGEX "soh/Extractor/*") if(NOT CMAKE_SYSTEM_NAME MATCHES "NintendoSwitch|CafeOS") - file(GLOB_RECURSE soh__Extractor RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + file(GLOB_RECURSE soh__Extractor CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "soh/Extractor/*.c" "soh/Extractor/*.cpp" "soh/Extractor/*.h" "soh/Extractor/*.hpp" ) else() - file(GLOB_RECURSE soh__Extractor RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + file(GLOB_RECURSE soh__Extractor CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "soh/Extractor/*.h" "soh/Extractor/*.hpp" ) @@ -182,7 +182,7 @@ endif() # }}} # src (decomp) {{{ -file(GLOB_RECURSE src__ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.c" "src/*.h") +file(GLOB_RECURSE src__ CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.c" "src/*.h") set_source_files_properties(${src__} PROPERTIES COMPILE_OPTIONS "${WARNING_OVERRIDE}") list(APPEND src__ ${CMAKE_CURRENT_SOURCE_DIR}/Resource.rc)