From 236c6160eb728351e4a3e00db078af9aa951626d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20R=C3=B6hling?= Date: Thu, 11 Aug 2022 13:49:34 +0200 Subject: [PATCH] Support new target export template introduced with CMake 3.24 (#395) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Timo Röhling (cherry picked from commit ca8c26ea3c89e69c0c636b7cd0c088674c689f5f) --- .../cmake/ament_cmake_export_targets-extras.cmake.in | 4 ++-- 1 file changed, 2 insertions(+), 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 index 8d86e949..a7402a6d 100644 --- 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)