From 14988660cda3f7a20ab2968789d916736c1d1e53 Mon Sep 17 00:00:00 2001 From: Copilot Date: Mon, 20 Jul 2026 13:12:03 +0200 Subject: [PATCH] cmake: make NGL_ADD_SUBDIR_GUARDED match by basename so MIGRATE_MODULE=Lts/DDS picks Lts/DDS correctly --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7cb10bf6..808dedda2 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -340,7 +340,10 @@ function(NGL_ADD_SUBDIR_GUARDED subdir) # normalize to forward slashes string(REPLACE "\\" "/" _mig "${MIGRATE_MODULE}") string(REPLACE "\\" "/" _sub "${subdir}") - if(_mig MATCHES "^${_sub}(/|$)" OR _sub MATCHES "^${_mig}(/|$)") + # also compare basenames so MIGRATE_MODULE=Lts/DDS matches subdir 'DDS' when called from Lts + get_filename_component(_mig_base "${_mig}" NAME) + get_filename_component(_sub_base "${_sub}" NAME) + if(_mig MATCHES "^${_sub}(/|$)" OR _sub MATCHES "^${_mig}(/|$)" OR _mig_base STREQUAL _sub OR _sub_base STREQUAL _mig) message(STATUS "Including subdir ${subdir} because MIGRATE_MODULE=${MIGRATE_MODULE}") add_subdirectory(${subdir}) else()