diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6da3b62..6dafd4a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -248,23 +248,29 @@ macro(TargetVars roots)
   endforeach(root ${${roots}})
 endmacro(TargetVars root)
 
-macro(TargetDeps proot)
+
+###
+# Loads dependencies from an in-src file named same as containing
+# directory with .deps suffix.  Dependencies are added to the
+# corresponding ${proot}_DEPENDS variable.
+# 
+# FIXME: Dependencies are also added here to a .dot file dependency
+# graph file, but that shouldn't be intertwined here as side effect.
+###
+macro(RegisterDeps proot)
   get_filename_component(dirname ${CMAKE_CURRENT_SOURCE_DIR} NAME)
   if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${dirname}.deps")
     message(FATAL_ERROR "No ${dirname}.deps file found in ${CMAKE_CURRENT_SOURCE_DIR}/")
   endif (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${dirname}.deps")
   file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/${dirname}.deps" DEP_LINES)
   string(TOLOWER "${proot}" lr)
+
+  # Add each dependency to this directory's _DEPENDS list
   foreach(dl ${DEP_LINES})
     set(${proot}_DEPENDS ${${proot}_DEPENDS} ${dl})
-    string(TOLOWER "${dl}" ldl)
-    # Add the dependency to the dot file
-    if (NOT "${ldl}" STREQUAL "patch")
-      file(APPEND "${CMAKE_BINARY_DIR}/bext.dot" "\t${lr} -> ${ldl};\n")
-    endif (NOT "${ldl}" STREQUAL "patch")
   endforeach(dl ${DEP_LINES})
 
-  # Add these dependencies to the global list
+  # Add all dependencies to the global ALL_DEPENDENCIES list
   get_property(ALL_DEPS GLOBAL PROPERTY ALL_DEPENDENCIES)
   set(ALL_DEPS ${ALL_DEPS} ${${proot}_DEPENDS})
   list(SORT ALL_DEPS)
@@ -273,7 +279,16 @@ macro(TargetDeps proot)
 
   # Set the TARGET variables for CMake generator expression "if" tests
   TargetVars(${proot}_DEPENDS)
-endmacro(TargetDeps)
+
+  # Add each dependency to a global .dot file
+  foreach(dl ${DEP_LINES})
+    string(TOLOWER "${dl}" ldl)
+    if (NOT "${ldl}" STREQUAL "patch")
+      file(APPEND "${CMAKE_BINARY_DIR}/bext.dot" "\t${lr} -> ${ldl};\n")
+    endif (NOT "${ldl}" STREQUAL "patch")
+  endforeach(dl ${DEP_LINES})
+
+endmacro(RegisterDeps)
 
 macro(TargetInstallDeps croot roots)
   foreach(root ${${roots}})
diff --git a/NOTES.md b/NOTES.md
index 54b960e9..dcbe3a33 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -577,7 +577,7 @@ if (ENABLE_GEOGRAM)
 
   git_submodule_init(geogram CMakeLists.txt)
 
-  TargetDeps(GEOGRAM)
+  RegisterDeps(GEOGRAM)
 
   ExternalProject_Add(GEOGRAM_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/geogram"
diff --git a/appleseed/CMakeLists.txt b/appleseed/CMakeLists.txt
index c26d56a3..88c0de65 100644
--- a/appleseed/CMakeLists.txt
+++ b/appleseed/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_APPLESEED)
 
   git_submodule_init(appleseed CMakeLists.txt)
 
-  TargetDeps(APPLESEED)
+  RegisterDeps(APPLESEED)
   if (TARGET ZLIB_BLD)
     set(Z_PREFIX_STR "brl_")
   endif (TARGET ZLIB_BLD)
diff --git a/assetimport/CMakeLists.txt b/assetimport/CMakeLists.txt
index 43f279e9..5a4bed68 100644
--- a/assetimport/CMakeLists.txt
+++ b/assetimport/CMakeLists.txt
@@ -10,7 +10,7 @@ if (ENABLE_ASSETIMPORT)
 
   git_submodule_init(assimp CMakeLists.txt)
 
-  TargetDeps(ASSETIMPORT)
+  RegisterDeps(ASSETIMPORT)
   if (TARGET ZLIB_BLD)
     set(ZLIB_TARGET ZLIB_BLD)
   endif (TARGET ZLIB_BLD)
diff --git a/astyle/CMakeLists.txt b/astyle/CMakeLists.txt
index 2c12fded..7f378d22 100644
--- a/astyle/CMakeLists.txt
+++ b/astyle/CMakeLists.txt
@@ -20,7 +20,7 @@ if (ENABLE_ASTYLE)
 
   git_submodule_init(astyle CMakeLists.txt)
 
-  TargetDeps(ASTYLE)
+  RegisterDeps(ASTYLE)
 
   ExternalProject_Add(ASTYLE_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/astyle"
diff --git a/boost/CMakeLists.txt b/boost/CMakeLists.txt
index 16853a99..8828a005 100644
--- a/boost/CMakeLists.txt
+++ b/boost/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_BOOST)
 
   git_submodule_init(boost CMakeLists.txt)
 
-  TargetDeps(BOOST)
+  RegisterDeps(BOOST)
 
   if (TARGET ZLIB_BLD)
     set(Z_PREFIX_STR "brl_")
diff --git a/deflate/CMakeLists.txt b/deflate/CMakeLists.txt
index 5a363d0d..d3c36c1e 100644
--- a/deflate/CMakeLists.txt
+++ b/deflate/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_DEFLATE)
 
   git_submodule_init(libdeflate CMakeLists.txt)
 
-  TargetDeps(DEFLATE)
+  RegisterDeps(DEFLATE)
 
   ExternalProject_Add(DEFLATE_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/libdeflate"
diff --git a/eigen/CMakeLists.txt b/eigen/CMakeLists.txt
index c972c814..606faab9 100644
--- a/eigen/CMakeLists.txt
+++ b/eigen/CMakeLists.txt
@@ -22,7 +22,7 @@ if (ENABLE_EIGEN)
 
   git_submodule_init(eigen CMakeLists.txt)
 
-  TargetDeps(EIGEN)
+  RegisterDeps(EIGEN)
 
   ExternalProject_Add(EIGEN_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/eigen"
diff --git a/embree/CMakeLists.txt b/embree/CMakeLists.txt
index 99fee60f..211480d4 100644
--- a/embree/CMakeLists.txt
+++ b/embree/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_EMBREE)
 
   git_submodule_init(embree CMakeLists.txt)
 
-  TargetDeps(EMBREE)
+  RegisterDeps(EMBREE)
   if (TARGET ZLIB_BLD)
     set(Z_PREFIX_STR "brl_")
   endif (TARGET ZLIB_BLD)
diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
index fef3941d..90e96444 100644
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_EXPAT)
 
   git_submodule_init(libexpat CMakeLists.txt)
 
-  TargetDeps(EXPAT)
+  RegisterDeps(EXPAT)
 
   ExternalProject_Add(EXPAT_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/libexpat"
diff --git a/fmt/CMakeLists.txt b/fmt/CMakeLists.txt
index 37f63e90..a434f76e 100644
--- a/fmt/CMakeLists.txt
+++ b/fmt/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_FMT)
 
   git_submodule_init(fmt CMakeLists.txt)
 
-  TargetDeps(FMT)
+  RegisterDeps(FMT)
 
   ExternalProject_Add(FMT_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/fmt"
diff --git a/gdal/CMakeLists.txt b/gdal/CMakeLists.txt
index 9393ef84..0a5a2b73 100644
--- a/gdal/CMakeLists.txt
+++ b/gdal/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_GDAL)
 
   git_submodule_init(gdal CMakeLists.txt)
 
-  TargetDeps(GDAL)
+  RegisterDeps(GDAL)
   if (TARGET ZLIB_BLD)
     set(Z_PREFIX_STR "brl_")
   endif (TARGET ZLIB_BLD)
diff --git a/geogram/CMakeLists.txt b/geogram/CMakeLists.txt
index bfb30aa4..d2c61c11 100644
--- a/geogram/CMakeLists.txt
+++ b/geogram/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_GEOGRAM)
 
   git_submodule_init(geogram CMakeLists.txt)
 
-  TargetDeps(GEOGRAM)
+  RegisterDeps(GEOGRAM)
 
   ExternalProject_Add(GEOGRAM_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/geogram"
diff --git a/gte/CMakeLists.txt b/gte/CMakeLists.txt
index e387c5e9..c464ab04 100644
--- a/gte/CMakeLists.txt
+++ b/gte/CMakeLists.txt
@@ -22,7 +22,7 @@ if (ENABLE_GTE)
 
   git_submodule_init(GeometricTools GTE/CMakeLists.txt)
 
-  TargetDeps(GTE)
+  RegisterDeps(GTE)
 
   ExternalProject_Add(GTE_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/GeometricTools"
diff --git a/icu/CMakeLists.txt b/icu/CMakeLists.txt
index 72231030..9c54f447 100644
--- a/icu/CMakeLists.txt
+++ b/icu/CMakeLists.txt
@@ -7,7 +7,7 @@ if (NOT WIN32 AND NOT APPLE)
 
     git_submodule_init(icu icu4c/source/configure)
 
-    TargetDeps(ICU)
+    RegisterDeps(ICU)
 
     ExternalProject_Add(ICU_BLD
       URL "${CMAKE_CURRENT_SOURCE_DIR}/icu"
diff --git a/ispc/CMakeLists.txt b/ispc/CMakeLists.txt
index f3dbad9a..6d6196a0 100644
--- a/ispc/CMakeLists.txt
+++ b/ispc/CMakeLists.txt
@@ -11,7 +11,7 @@ if (ENABLE_ISPC)
 
   git_submodule_init(ispc CMakeLists.txt)
 
-  TargetDeps(ISPC)
+  RegisterDeps(ISPC)
   if (TARGET ZLIB_BLD)
     set(Z_PREFIX_STR "brl_")
   endif (TARGET ZLIB_BLD)
diff --git a/itcl/CMakeLists.txt b/itcl/CMakeLists.txt
index daebc3c4..573c2f39 100644
--- a/itcl/CMakeLists.txt
+++ b/itcl/CMakeLists.txt
@@ -26,7 +26,7 @@ if (ENABLE_ITCL)
 
   git_submodule_init(itcl configure.in)
 
-  TargetDeps(ITCL)
+  RegisterDeps(ITCL)
 
   # Itcl3 has a problem in that it requires internal Tcl headers.
   # Occasionally (but not always) we can get these headers from
@@ -41,6 +41,8 @@ if (ENABLE_ITCL)
     endif(NOT WIN32)
   endif (EXISTS ${HDRS_CANDIDATE_DIR})
 
+  # message("TCL HEADERS1:  ${TCL_PRIVATE_HDRS}")
+  
   # If we can't find them from the system, see if we have a local
   # clone of Tcl to use
   if (NOT TCL_PRIVATE_HDRS AND EXISTS ${CMAKE_SOURCE_DIR}/tcl/tcl)
@@ -52,6 +54,8 @@ if (ENABLE_ITCL)
     endif(NOT WIN32)
   endif (NOT TCL_PRIVATE_HDRS AND EXISTS ${CMAKE_SOURCE_DIR}/tcl/tcl)
 
+  # message("TCL HEADERS2:  ${TCL_PRIVATE_HDRS}")
+
   # If we STILL don't have anything, patch the Itcl sources to add
   # the headers in question
   set(TCL_HDRS_PATCH_CMD)
@@ -65,6 +69,8 @@ if (ENABLE_ITCL)
     endif(NOT WIN32)
   endif (NOT TCL_PRIVATE_HDRS)
 
+  # message("TCL HEADERS3:  ${TCL_PRIVATE_HDRS}")
+
   # When building ITCL, its path setup must take into account the subdirectory
   # in which we are storing the library.
   set(RPATH_SUFFIX itcl3.4)
diff --git a/itk/CMakeLists.txt b/itk/CMakeLists.txt
index dd537414..9faeba6e 100644
--- a/itk/CMakeLists.txt
+++ b/itk/CMakeLists.txt
@@ -38,7 +38,7 @@ if (ENABLE_ITK)
 
   git_submodule_init(itk configure.in)
 
-  TargetDeps(ITK)
+  RegisterDeps(ITK)
 
   # If we're building ITK, it's path setup must take into account the
   # subdirectory in which we are storing the library.
diff --git a/iwidgets/CMakeLists.txt b/iwidgets/CMakeLists.txt
index e83b6221..497b1f75 100644
--- a/iwidgets/CMakeLists.txt
+++ b/iwidgets/CMakeLists.txt
@@ -24,7 +24,7 @@ if (ENABLE_IWIDGETS)
 
   git_submodule_init(iwidgets CMakeLists.txt)
 
-  TargetDeps(IWIDGETS)
+  RegisterDeps(IWIDGETS)
 
   ExternalProject_Add(IWIDGETS_BLD
     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/iwidgets"
diff --git a/jpeg/CMakeLists.txt b/jpeg/CMakeLists.txt
index 89d8e9b4..055365ee 100644
--- a/jpeg/CMakeLists.txt
+++ b/jpeg/CMakeLists.txt
@@ -10,7 +10,7 @@ if (ENABLE_JPEG)
 
   git_submodule_init(libjpeg-turbo CMakeLists.txt)
 
-  TargetDeps(JPEG)
+  RegisterDeps(JPEG)
 
   ExternalProject_Add(JPEG_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-turbo"
diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
index 9201da4c..c1ca0a2e 100644
--- a/lemon/CMakeLists.txt
+++ b/lemon/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_LEMON)
 
   git_submodule_init(lemon lemon.c)
 
-  TargetDeps(LEMON)
+  RegisterDeps(LEMON)
 
   ExternalProject_Add(LEMON_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/lemon"
diff --git a/lief/CMakeLists.txt b/lief/CMakeLists.txt
index 84910558..ce67aab9 100644
--- a/lief/CMakeLists.txt
+++ b/lief/CMakeLists.txt
@@ -11,7 +11,7 @@ if (NOT MSVC AND NOT APPLE)
 
     git_submodule_init(LIEF CMakeLists.txt)
 
-    TargetDeps(LIEF)
+    RegisterDeps(LIEF)
 
     ExternalProject_Add(LIEF_BLD
       URL "${CMAKE_CURRENT_SOURCE_DIR}/LIEF"
diff --git a/linenoise/CMakeLists.txt b/linenoise/CMakeLists.txt
index 755771f1..b5061739 100644
--- a/linenoise/CMakeLists.txt
+++ b/linenoise/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_LINENOISE)
 
   git_submodule_init(linenoise linenoise.c)
 
-  TargetDeps(LINENOISE)
+  RegisterDeps(LINENOISE)
 
   ExternalProject_Add(LINENOISE_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/linenoise"
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index 46ec5466..ff5edc43 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_LLVM)
 
   git_submodule_init(llvm-project llvm/CMakeLists.txt)
 
-  TargetDeps(LLVM)
+  RegisterDeps(LLVM)
 
   # We may need one or more patches, depending on settings.  ExternalProject_Add
   # expects the first command to be "PATCH_COMMAND", with subsequent patch commands
diff --git a/lmdb/CMakeLists.txt b/lmdb/CMakeLists.txt
index d59c6591..9bc94e8c 100644
--- a/lmdb/CMakeLists.txt
+++ b/lmdb/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_LMDB)
 
   git_submodule_init(lmdb libraries/liblmdb/mdb.c)
 
-  TargetDeps(LMDB)
+  RegisterDeps(LMDB)
 
   ExternalProject_Add(LMDB_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/lmdb"
diff --git a/lz4/CMakeLists.txt b/lz4/CMakeLists.txt
index 59e2ccb3..316eb9f3 100644
--- a/lz4/CMakeLists.txt
+++ b/lz4/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_LZ4)
 
   git_submodule_init(lz4 CMakeLists.txt)
 
-  TargetDeps(LZ4)
+  RegisterDeps(LZ4)
 
   ExternalProject_Add(LZ4_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/lz4"
diff --git a/manifold/CMakeLists.txt b/manifold/CMakeLists.txt
index c8cb5790..f20506c2 100644
--- a/manifold/CMakeLists.txt
+++ b/manifold/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_MANIFOLD)
 
   git_submodule_init(manifold src/manifold/include/manifold.h)
 
-  TargetDeps(MANIFOLD)
+  RegisterDeps(MANIFOLD)
 
   ExternalProject_Add(MANIFOLD_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/manifold"
diff --git a/minizip-ng/CMakeLists.txt b/minizip-ng/CMakeLists.txt
index 085cac8b..c0e6fad5 100644
--- a/minizip-ng/CMakeLists.txt
+++ b/minizip-ng/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_MINIZIP_NG)
 
   git_submodule_init(minizip-ng CMakeLists.txt)
 
-  TargetDeps(MINIZIP_NG)
+  RegisterDeps(MINIZIP_NG)
   if (TARGET ZLIB_BLD)
     set(Z_PREFIX_STR "brl_")
   endif (TARGET ZLIB_BLD)
diff --git a/ncurses/CMakeLists.txt b/ncurses/CMakeLists.txt
index 16b6aaf6..581bb6e0 100644
--- a/ncurses/CMakeLists.txt
+++ b/ncurses/CMakeLists.txt
@@ -22,7 +22,7 @@ if (NOT WIN32)
 
     git_submodule_init(ncurses README)
 
-    TargetDeps(NCURSES)
+    RegisterDeps(NCURSES)
 
     set(NCURSES_SRC_DIR "${CMAKE_CURRENT_BINARY_DIR}/NCURSES_BLD-prefix/src/NCURSES_BLD")
 
diff --git a/netpbm/CMakeLists.txt b/netpbm/CMakeLists.txt
index 284294ec..7c9b2a90 100644
--- a/netpbm/CMakeLists.txt
+++ b/netpbm/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_NETPBM)
 
   git_submodule_init(netpbm CMakeLists.txt)
 
-  TargetDeps(NETPBM)
+  RegisterDeps(NETPBM)
 
   ExternalProject_Add(NETPBM_BLD
     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/netpbm"
diff --git a/onetbb/CMakeLists.txt b/onetbb/CMakeLists.txt
index 7c67caee..b8ccaba7 100644
--- a/onetbb/CMakeLists.txt
+++ b/onetbb/CMakeLists.txt
@@ -19,7 +19,7 @@ if (ENABLE_ONETBB)
 
   git_submodule_init(oneTBB CMakeLists.txt)
 
-  TargetDeps(ONETBB)
+  RegisterDeps(ONETBB)
 
   ExternalProject_Add(ONETBB_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/oneTBB"
diff --git a/opencolorio/CMakeLists.txt b/opencolorio/CMakeLists.txt
index 91c1a451..e2c2cfea 100644
--- a/opencolorio/CMakeLists.txt
+++ b/opencolorio/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_OPENCOLORIO)
 
   git_submodule_init(OpenColorIO CMakeLists.txt)
 
-  TargetDeps(OPENCOLORIO)
+  RegisterDeps(OPENCOLORIO)
   if (TARGET ZLIB_BLD)
     set(Z_PREFIX_STR "brl_")
   endif (TARGET ZLIB_BLD)
diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index 4751e00d..60098a86 100644
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_OPENCV)
 
   git_submodule_init(opencv CMakeLists.txt)
 
-  TargetDeps(OPENCV)
+  RegisterDeps(OPENCV)
   if (TARGET ZLIB_BLD)
     set(Z_PREFIX_STR "brl_")
   endif (TARGET ZLIB_BLD)
diff --git a/openexr/CMakeLists.txt b/openexr/CMakeLists.txt
index 9890a296..c0d98c76 100644
--- a/openexr/CMakeLists.txt
+++ b/openexr/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_OPENEXR)
 
   git_submodule_init(openexr CMakeLists.txt)
 
-  TargetDeps(OPENEXR)
+  RegisterDeps(OPENEXR)
 
   ExternalProject_Add(OPENEXR_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/openexr"
diff --git a/openimageio/CMakeLists.txt b/openimageio/CMakeLists.txt
index 43a2ab29..a7ae08cc 100644
--- a/openimageio/CMakeLists.txt
+++ b/openimageio/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_OPENIMAGEIO)
 
   git_submodule_init(oiio CMakeLists.txt)
 
-  TargetDeps(OPENIMAGEIO)
+  RegisterDeps(OPENIMAGEIO)
   if (TARGET ZLIB_BLD)
     set(Z_PREFIX_STR "brl_")
   endif (TARGET ZLIB_BLD)
diff --git a/openmesh/CMakeLists.txt b/openmesh/CMakeLists.txt
index c7ba97d3..e498099e 100644
--- a/openmesh/CMakeLists.txt
+++ b/openmesh/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_OPENMESH)
 
   git_submodule_init(OpenMesh CMakeLists.txt)
 
-  TargetDeps(OPENMESH)
+  RegisterDeps(OPENMESH)
 
   ExternalProject_Add(OPENMESH_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/OpenMesh"
diff --git a/opennurbs/CMakeLists.txt b/opennurbs/CMakeLists.txt
index b49d0bf6..75120755 100644
--- a/opennurbs/CMakeLists.txt
+++ b/opennurbs/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_OPENNURBS)
 
   git_submodule_init(opennurbs opennurbs.h)
 
-  TargetDeps(OPENNURBS)
+  RegisterDeps(OPENNURBS)
   if (TARGET ZLIB_BLD)
     set(Z_PREFIX_STR "brl_")
   endif (TARGET ZLIB_BLD)
diff --git a/osl/CMakeLists.txt b/osl/CMakeLists.txt
index 561cb14d..da47a9cd 100644
--- a/osl/CMakeLists.txt
+++ b/osl/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_OSL)
 
   git_submodule_init(OpenShadingLanguage CMakeLists.txt)
 
-  TargetDeps(OSL)
+  RegisterDeps(OSL)
   if (TARGET ZLIB_BLD)
     set(Z_PREFIX_STR "brl_")
   endif (TARGET ZLIB_BLD)
diff --git a/osmesa/CMakeLists.txt b/osmesa/CMakeLists.txt
index 9e1baff3..d18da444 100644
--- a/osmesa/CMakeLists.txt
+++ b/osmesa/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_OSMESA)
 
   git_submodule_init(osmesa CMakeLists.txt)
 
-  TargetDeps(OSMESA)
+  RegisterDeps(OSMESA)
 
   ExternalProject_Add(OSMESA_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/osmesa"
diff --git a/ospray/CMakeLists.txt b/ospray/CMakeLists.txt
index 4c40e0b3..4ca97201 100644
--- a/ospray/CMakeLists.txt
+++ b/ospray/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_OSPRAY)
 
   git_submodule_init(ospray CMakeLists.txt)
 
-  TargetDeps(OSPRAY)
+  RegisterDeps(OSPRAY)
 
   ExternalProject_Add(OSPRAY_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/ospray"
diff --git a/perplex/CMakeLists.txt b/perplex/CMakeLists.txt
index 3b2e7a52..6806d13d 100644
--- a/perplex/CMakeLists.txt
+++ b/perplex/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_PERPLEX)
 
   git_submodule_init(perplex CMakeLists.txt)
 
-  TargetDeps(PERPLEX)
+  RegisterDeps(PERPLEX)
 
   ExternalProject_Add(PERPLEX_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/perplex"
diff --git a/plief/CMakeLists.txt b/plief/CMakeLists.txt
index da26ab82..ddf3ae72 100644
--- a/plief/CMakeLists.txt
+++ b/plief/CMakeLists.txt
@@ -25,7 +25,7 @@ if (NOT MSVC AND NOT APPLE)
 
     git_submodule_init(plief CMakeLists.txt)
 
-    TargetDeps(PLIEF)
+    RegisterDeps(PLIEF)
 
     ExternalProject_Add(PLIEF_BLD
       URL "${CMAKE_CURRENT_SOURCE_DIR}/plief"
diff --git a/png/CMakeLists.txt b/png/CMakeLists.txt
index f0e13378..d0fc2d54 100644
--- a/png/CMakeLists.txt
+++ b/png/CMakeLists.txt
@@ -22,7 +22,7 @@ if (ENABLE_PNG)
 
   git_submodule_init(libpng CMakeLists.txt)
 
-  TargetDeps(PNG)
+  RegisterDeps(PNG)
   if (TARGET ZLIB_BLD)
     set(Z_PREFIX_STR "brl_")
   endif (TARGET ZLIB_BLD)
diff --git a/poissonrecon/CMakeLists.txt b/poissonrecon/CMakeLists.txt
index e3ee2fe7..648a9bf4 100644
--- a/poissonrecon/CMakeLists.txt
+++ b/poissonrecon/CMakeLists.txt
@@ -22,7 +22,7 @@ if (ENABLE_POISSONRECON)
 
   git_submodule_init(PoissonRecon POISSONRECON/CMakeLists.txt)
 
-  TargetDeps(POISSONRECON)
+  RegisterDeps(POISSONRECON)
 
   ExternalProject_Add(POISSONRECON_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/PoissonRecon"
diff --git a/proj/CMakeLists.txt b/proj/CMakeLists.txt
index 7755a4e3..d410a4c6 100644
--- a/proj/CMakeLists.txt
+++ b/proj/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_PROJ)
 
   git_submodule_init(PROJ CMakeLists.txt)
 
-  TargetDeps(PROJ)
+  RegisterDeps(PROJ)
 
   ExternalProject_Add(PROJ_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/PROJ"
diff --git a/pugixml/CMakeLists.txt b/pugixml/CMakeLists.txt
index 3460926a..a1d27aab 100644
--- a/pugixml/CMakeLists.txt
+++ b/pugixml/CMakeLists.txt
@@ -10,7 +10,7 @@ if (ENABLE_PUGIXML)
 
   git_submodule_init(pugixml CMakeLists.txt)
 
-  TargetDeps(PUGIXML)
+  RegisterDeps(PUGIXML)
 
   ExternalProject_Add(PUGIXML_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/pugixml"
diff --git a/pystring/CMakeLists.txt b/pystring/CMakeLists.txt
index ad194565..79e87bba 100644
--- a/pystring/CMakeLists.txt
+++ b/pystring/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_PYSTRING)
 
   git_submodule_init(pystring CMakeLists.txt)
 
-  TargetDeps(PYSTRING)
+  RegisterDeps(PYSTRING)
 
   ExternalProject_Add(PYSTRING_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/pystring"
diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
index d856d37f..bd3e6c7d 100644
--- a/qt/CMakeLists.txt
+++ b/qt/CMakeLists.txt
@@ -19,7 +19,7 @@ if (ENABLE_QT)
 
   git_submodule_init(qt qtbase/configure)
 
-  TargetDeps(Qt6)
+  RegisterDeps(Qt6)
 
   if (isMultiConfig)
     set(CBT $<CONFIG>)
diff --git a/re2c/CMakeLists.txt b/re2c/CMakeLists.txt
index 9e20fa42..31817de7 100644
--- a/re2c/CMakeLists.txt
+++ b/re2c/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_RE2C)
 
   git_submodule_init(re2c CMakeLists.txt)
 
-  TargetDeps(RE2C)
+  RegisterDeps(RE2C)
 
   ExternalProject_Add(RE2C_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/re2c"
diff --git a/regex/CMakeLists.txt b/regex/CMakeLists.txt
index 8f4d0d19..0e813594 100644
--- a/regex/CMakeLists.txt
+++ b/regex/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_REGEX)
 
   git_submodule_init(regex regex2.h)
 
-  TargetDeps(REGEX)
+  RegisterDeps(REGEX)
 
   set(REGEX_PREFIX_STR "libregex_")
 
diff --git a/rkcommon/CMakeLists.txt b/rkcommon/CMakeLists.txt
index 9a22e61a..1c069246 100644
--- a/rkcommon/CMakeLists.txt
+++ b/rkcommon/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_RKCOMMON)
 
   git_submodule_init(rkcommon CMakeLists.txt)
 
-  TargetDeps(RKCOMMON)
+  RegisterDeps(RKCOMMON)
 
     ExternalProject_Add(RKCOMMON_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/rkcommon"
diff --git a/sqlite3/CMakeLists.txt b/sqlite3/CMakeLists.txt
index 60eb8352..79e4ecb8 100644
--- a/sqlite3/CMakeLists.txt
+++ b/sqlite3/CMakeLists.txt
@@ -19,7 +19,7 @@ if (ENABLE_SQLite3)
 
   git_submodule_init(sqlite3 sqlite3.c)
 
-  TargetDeps(SQLITE3)
+  RegisterDeps(SQLITE3)
 
   ExternalProject_Add(SQLITE3_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/sqlite3"
diff --git a/stepcode/CMakeLists.txt b/stepcode/CMakeLists.txt
index da507374..8cc6e86c 100644
--- a/stepcode/CMakeLists.txt
+++ b/stepcode/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_STEPCODE)
 
   git_submodule_init(stepcode CMakeLists.txt)
 
-  TargetDeps(STEPCODE)
+  RegisterDeps(STEPCODE)
 
   # For OSX, we need CMAKE_INSTALL_NAME_DIR
   set(CMAKE_INSTALL_NAME_DIR "@rpath")
diff --git a/strclear/CMakeLists.txt b/strclear/CMakeLists.txt
index 3a6bddc4..af4673a2 100644
--- a/strclear/CMakeLists.txt
+++ b/strclear/CMakeLists.txt
@@ -20,7 +20,7 @@ if (ENABLE_STRCLEAR)
 
   git_submodule_init(strclear CMakeLists.txt)
 
-  TargetDeps(STRCLEAR)
+  RegisterDeps(STRCLEAR)
 
   ExternalProject_Add(STRCLEAR_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/strclear"
diff --git a/tcl/CMakeLists.txt b/tcl/CMakeLists.txt
index e78805cc..04fcb55f 100644
--- a/tcl/CMakeLists.txt
+++ b/tcl/CMakeLists.txt
@@ -36,7 +36,7 @@ if (ENABLE_TCL)
 
   git_submodule_init(tcl unix/configure)
 
-  TargetDeps(TCL)
+  RegisterDeps(TCL)
 
   set(TCL_SRC_DIR "${CMAKE_CURRENT_BINARY_DIR}/TCL_BLD-prefix/src/TCL_BLD")
   set(TCL_BIN_DIR "${CMAKE_CURRENT_BINARY_DIR}/TCL_BLD-prefix/src/TCL_BLD-build")
diff --git a/tiff/CMakeLists.txt b/tiff/CMakeLists.txt
index 18f6cc4d..19a1da07 100644
--- a/tiff/CMakeLists.txt
+++ b/tiff/CMakeLists.txt
@@ -10,7 +10,7 @@ if (ENABLE_TIFF)
 
   git_submodule_init(libtiff CMakeLists.txt)
 
-  TargetDeps(TIFF)
+  RegisterDeps(TIFF)
   if (TARGET ZLIB_BLD)
     set(Z_PREFIX_STR "brl_")
   endif (TARGET ZLIB_BLD)
diff --git a/tk/CMakeLists.txt b/tk/CMakeLists.txt
index 4c62844f..fea0aac5 100644
--- a/tk/CMakeLists.txt
+++ b/tk/CMakeLists.txt
@@ -15,7 +15,7 @@ if (TK_DO_BUILD)
 
   git_submodule_init(tk unix/configure)
 
-  TargetDeps(TK)
+  RegisterDeps(TK)
 
   if (TARGET TCL_BLD)
     # If we're building against a compiled Tcl and not a system Tcl,
diff --git a/tkhtml/CMakeLists.txt b/tkhtml/CMakeLists.txt
index d133965b..103adbdf 100644
--- a/tkhtml/CMakeLists.txt
+++ b/tkhtml/CMakeLists.txt
@@ -41,7 +41,7 @@ if (ENABLE_TKHTML)
 
   git_submodule_init(tkhtml CMakeLists.txt)
 
-  TargetDeps(TKHTML)
+  RegisterDeps(TKHTML)
 
   ExternalProject_Add(TKHTML_BLD
     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tkhtml"
diff --git a/tktable/CMakeLists.txt b/tktable/CMakeLists.txt
index 71a5e628..f4f0ebba 100644
--- a/tktable/CMakeLists.txt
+++ b/tktable/CMakeLists.txt
@@ -42,7 +42,7 @@ if (ENABLE_TKTABLE)
 
   git_submodule_init(tktable CMakeLists.txt)
 
-  TargetDeps(TKTABLE)
+  RegisterDeps(TKTABLE)
 
   ExternalProject_Add(TKTABLE_BLD
     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tktable"
diff --git a/utahrle/CMakeLists.txt b/utahrle/CMakeLists.txt
index 2be8a198..97445e00 100644
--- a/utahrle/CMakeLists.txt
+++ b/utahrle/CMakeLists.txt
@@ -9,7 +9,7 @@ if (ENABLE_UTAHRLE)
 
   git_submodule_init(utahrle CMakeLists.txt)
 
-  TargetDeps(UTAHRLE)
+  RegisterDeps(UTAHRLE)
 
   ExternalProject_Add(UTAHRLE_BLD
     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/utahrle"
diff --git a/xerces-c/CMakeLists.txt b/xerces-c/CMakeLists.txt
index 84bd16be..0b47082d 100644
--- a/xerces-c/CMakeLists.txt
+++ b/xerces-c/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_XERCES_C)
 
   git_submodule_init(xerces-c CMakeLists.txt)
 
-  TargetDeps(XERCES_C)
+  RegisterDeps(XERCES_C)
 
   ExternalProject_Add(XERCES_C_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/xerces-c"
diff --git a/xmltools/CMakeLists.txt b/xmltools/CMakeLists.txt
index c3d5fb2d..90e739db 100644
--- a/xmltools/CMakeLists.txt
+++ b/xmltools/CMakeLists.txt
@@ -24,7 +24,7 @@ if (ENABLE_XMLTOOLS)
 
   git_submodule_init(xmltools CMakeLists.txt)
 
-  TargetDeps(XMLTOOLS)
+  RegisterDeps(XMLTOOLS)
 
   ExternalProject_Add(XMLTOOLS_BLD
     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/xmltools"
diff --git a/yaml-cpp/CMakeLists.txt b/yaml-cpp/CMakeLists.txt
index 3fc31ec4..7d2a6197 100644
--- a/yaml-cpp/CMakeLists.txt
+++ b/yaml-cpp/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_YAML_CPP)
 
   git_submodule_init(yaml-cpp CMakeLists.txt)
 
-  TargetDeps(YAML_CPP)
+  RegisterDeps(YAML_CPP)
 
   ExternalProject_Add(YAML_CPP_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp"
diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
index a43c8a3d..12a98b41 100644
--- a/zlib/CMakeLists.txt
+++ b/zlib/CMakeLists.txt
@@ -11,7 +11,7 @@ if (ENABLE_ZLIB)
 
   git_submodule_init(zlib zlib.h)
 
-  TargetDeps(ZLIB)
+  RegisterDeps(ZLIB)
 
   set(Z_PREFIX_STR "brl_")
   mark_as_advanced(Z_PREFIX_STR)
diff --git a/zstd/CMakeLists.txt b/zstd/CMakeLists.txt
index 549fd12e..9de9ebb0 100644
--- a/zstd/CMakeLists.txt
+++ b/zstd/CMakeLists.txt
@@ -5,7 +5,7 @@ if (ENABLE_ZSTD)
 
   git_submodule_init(zstd LICENSE)
 
-  TargetDeps(ZSTD)
+  RegisterDeps(ZSTD)
 
   ExternalProject_Add(ZSTD_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/zstd"