diff --git a/CMake/NamespaceHandler.cmake b/CMake/NamespaceHandler.cmake
index ae23e4e82fea36c0c1c347bea6354b569f2c91aa..d9afe3a37948a904589e212476607261bb7cbbf4 100644
--- a/CMake/NamespaceHandler.cmake
+++ b/CMake/NamespaceHandler.cmake
@@ -53,6 +53,7 @@ function(otb_set_namespace folder ns)
     list(APPEND _files_to_process ${_other_targets})
     file(GLOB _module_files "${folder}/Modules/*.cmake")
     list(APPEND _files_to_process ${_module_files})
+    list(APPEND _files_to_process "${folder}/OTBStandaloneModuleMacros.cmake")
 
     # patch each file
     foreach(_file_path ${_files_to_process})
@@ -87,6 +88,16 @@ function(otb_set_namespace folder ns)
           string(REPLACE ")" " )" _filtered_line "${_filtered_line}")
           ns_filter_line()
           string(REPLACE " )" ")" _filtered_line "${_filtered_line}")
+        elseif(_filtered_line MATCHES "<TARGET_FILE:")
+          set(_t_prefix "TARGET_FILE:")
+          set(_t_suffix ">")
+          ns_filter_line()
+        elseif(_filtered_line MATCHES "add_dependencies")
+          set(_t_prefix " ")
+          set(_t_suffix " ")
+          string(REPLACE ")" " )" _filtered_line "${_filtered_line}")
+          ns_filter_line()
+          string(REPLACE " )" ")" _filtered_line "${_filtered_line}")
         endif()
         list(APPEND _file_filtered_content ${_filtered_line})
       endforeach()