Skip to content

Commit 4221f02

Browse files
authored
Fix ament_libraries_deduplicate Regex
see ament#448 (comment) Signed-off-by: Vincent Richard <[email protected]>
1 parent aa49800 commit 4221f02

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ament_cmake_libraries/cmake/ament_libraries_deduplicate.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
# @public
2727
#
2828
macro(ament_libraries_deduplicate VAR)
29-
string(REGEX REPLACE "(^|;)(debug|optimized|general);(.+)" "\\2${AMENT_BUILD_CONFIGURATION_KEYWORD_SEPARATOR}\\3" _packed "${ARGN}")
29+
string(REGEX REPLACE "(^|;)(debug|optimized|general);([^;]+)" "\\1\\2${AMENT_BUILD_CONFIGURATION_KEYWORD_SEPARATOR}\\3" _packed "${ARGN}")
3030
list(REVERSE _packed)
3131
list(REMOVE_DUPLICATES _packed)
3232
list(REVERSE _packed)
33-
string(REGEX REPLACE "(^|;)(debug|optimized|general)${AMENT_BUILD_CONFIGURATION_KEYWORD_SEPARATOR}(.+)" "\\2;\\3" ${VAR} "${_packed}")
33+
string(REGEX REPLACE "(^|;)(debug|optimized|general)${AMENT_BUILD_CONFIGURATION_KEYWORD_SEPARATOR}([^;]+)" "\\1\\2;\\3" ${VAR} "${_packed}")
3434
endmacro()

0 commit comments

Comments
 (0)