diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41f0d41ff..8a19b2644 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -359,6 +359,13 @@ endfunction()
 NGL_ADD_SUBDIR_GUARDED(TetraIF)
 NGL_ADD_SUBDIR_GUARDED(Z/src)
 NGL_ADD_SUBDIR_GUARDED(Lts)
+# Special-case: when migrating TetraIF, also include TrainingAreaBase and Z so generated headers
+# and internal logger target are available in the same build tree for TetraIF dependents.
+if(DEFINED MIGRATE_MODULE AND MIGRATE_MODULE STREQUAL "TetraIF")
+  message(STATUS "Including helper modules for TetraIF migration: Lts/Proxies/TrainingAreaBase and Z/src")
+  add_subdirectory(Lts/Proxies/TrainingAreaBase)
+  add_subdirectory(Z/src)
+endif()
 # at last, to make sure we get all targets in NGL_TS_TARGETS property
 NGL_ADD_SUBDIR_GUARDED(translations)
 #-----------------------------------------------------------------------------------------------------