fix regex for build configuration keywords (#148)

ament · Aug 8, 2018 · 7b4eebf · 7b4eebf
1 parent 7ab62a8
commit 7b4eebf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/ament_cmake_export_libraries/cmake/ament_cmake_export_libraries-extras.cmake.in b/ament_cmake_export_libraries/cmake/ament_cmake_export_libraries-extras.cmake.in
@@ -18,7 +18,7 @@ if(NOT _exported_libraries STREQUAL "")
       continue()
     endif()
 
-    if("${_arg}" MATCHES "^debug|optimized|general$")
+    if("${_arg}" MATCHES "^(debug|optimized|general)$")
       # remember build configuration keyword
       # and get following library
       set(_cfg "${_arg}")
@@ -83,7 +83,7 @@ if(NOT _exported_library_names STREQUAL "")
       continue()
     endif()
 
-    if("${_arg}" MATCHES "^debug|optimized|general$")
+    if("${_arg}" MATCHES "^(debug|optimized|general)$")
       # remember build configuration keyword
       # and get following library name
       set(_cfg "${_arg}")

diff --git a/ament_cmake_export_libraries/cmake/ament_export_libraries.cmake b/ament_cmake_export_libraries/cmake/ament_export_libraries.cmake
@@ -47,7 +47,7 @@ macro(ament_export_libraries)
         continue()
       endif()
 
-      if("${_arg}" MATCHES "^debug|optimized|general$")
+      if("${_arg}" MATCHES "^(debug|optimized|general)$")
         # remember build configuration keyword
         # and get following library
         set(_cfg "${_arg}")

diff --git a/ament_cmake_export_libraries/cmake/ament_export_library_names.cmake b/ament_cmake_export_libraries/cmake/ament_export_library_names.cmake
@@ -42,7 +42,7 @@ macro(ament_export_library_names)
     endif()
 
     foreach(_library_name ${_ARG_UNPARSED_ARGUMENTS})
-      if("${_library_name}" MATCHES "^debug|optimized|general$")
+      if("${_library_name}" MATCHES "^(debug|optimized|general)$")
         # keep build configuration keyword as-is
         list(APPEND _AMENT_EXPORT_LIBRARY_NAMES "${_library_name}")
       else()

diff --git a/ament_cmake_libraries/cmake/ament_libraries_pack_build_configuration.cmake b/ament_cmake_libraries/cmake/ament_libraries_pack_build_configuration.cmake
@@ -30,7 +30,7 @@ macro(ament_libraries_pack_build_configuration VAR)
   set(_index 0)
   while(${_index} LESS ${_count})
     list(GET _argn ${_index} _lib)
-    if("${_lib}" MATCHES "^debug|optimized|general$")
+    if("${_lib}" MATCHES "^(debug|optimized|general)$")
       math(EXPR _index "${_index} + 1")
       if(${_index} EQUAL ${_count})
         message(FATAL_ERROR "ament_libraries_pack_build_configuration() the list of libraries '${_argn}' ends with '${_lib}' which is a build configuration keyword and must be followed by a library")