From 274a6afd62e6480757b17943bffd721797a06e19 Mon Sep 17 00:00:00 2001 From: Alex Lin Date: Tue, 21 Jul 2015 14:30:04 -0500 Subject: [PATCH] Split CP up into components that can be called individually Added a doxygen keyword marker "@" character as valid after library dependencies. refs #86 --- libexec/trick/pm/get_lib_deps.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libexec/trick/pm/get_lib_deps.pm b/libexec/trick/pm/get_lib_deps.pm index 3b3dd134..627c6a5c 100644 --- a/libexec/trick/pm/get_lib_deps.pm +++ b/libexec/trick/pm/get_lib_deps.pm @@ -15,7 +15,9 @@ sub get_lib_deps ($$) { my (@lib_list) ; my (@inc_paths) ; - ($lib_deps) = $contents =~ /LIBRARY[ _]DEPENDENC(?:Y|IES):[^(]*(.*?)\)([A-Z _\t\n\r]+:|\s*\*)/si ; + # library dependency regular expression will match all the way through last parenthesis followed by + # another field in the trick header, a doxygen style keyword, or the end of comment *. + ($lib_deps) = $contents =~ /LIBRARY[ _]DEPENDENC(?:Y|IES):[^(]*(.*?)\)([A-Z _\t\n\r]+:|\s*[\*@])/si ; @lib_list = split /\)[ \t\n\r\*]*\(/ , $lib_deps ; @inc_paths = $ENV{"TRICK_CFLAGS"} =~ /-I\s*(\S+)/g ; # get include paths from TRICK_CFLAGS