Support new target export template introduced with CMake 3.24 (#395) (#…

…397) Signed-off-by: Timo Röhling <[email protected]> (cherry picked from commit ca8c26e) Co-authored-by: Timo Röhling <[email protected]>
ament · Aug 12, 2022 · 8050b39 · 8050b39
1 parent d23ce2c
commit 8050b39
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ament_cmake_export_targets/cmake/ament_cmake_export_targets-extras.cmake.in b/ament_cmake_export_targets/cmake/ament_cmake_export_targets-extras.cmake.in
@@ -9,7 +9,7 @@ if(NOT _exported_targets STREQUAL "")
     include("${_export_file}")
 
     # extract the target names associated with the export
-    set(_regex "foreach\\(_expectedTarget (.+)\\)")
+    set(_regex "foreach\\((_cmake)?_expected_?[Tt]arget (IN ITEMS )?(.+)\\)")
     file(
       STRINGS "${_export_file}" _foreach_targets
       REGEX "${_regex}")
@@ -18,7 +18,7 @@ if(NOT _exported_targets STREQUAL "")
       message(FATAL_ERROR
         "Failed to find exported target names in '${_export_file}'")
     endif()
-    string(REGEX REPLACE "${_regex}" "\\1" _targets "${_foreach_targets}")
+    string(REGEX REPLACE "${_regex}" "\\3" _targets "${_foreach_targets}")
     string(REPLACE " " ";" _targets "${_targets}")
     list(LENGTH _targets _length)