From f7c73833b451a3df74dd92190a7a0e4bf97191fb Mon Sep 17 00:00:00 2001
From: Johann Dreo <johann.dreo@thalesgroup.com>
Date: Thu, 19 Sep 2013 14:02:24 +0200
Subject: [PATCH] Correct small errors in cmake theme

Do not use nested groups for "Linking" messages.
Allow "-" in file names for "Building" messages.
---
 colout/colout_cmake.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/colout/colout_cmake.py b/colout/colout_cmake.py
index d58e6c1..27644f9 100644
--- a/colout/colout_cmake.py
+++ b/colout/colout_cmake.py
@@ -23,13 +23,13 @@ def theme():
         [ "^(Scanning dependencies of target)(.*)$",
           performing, "normal,bold" ],
         # Link
-        [ "^(Linking .* (library|executable) )(.*/)+(.+(\.[aso]+)*)$",
+        [ "^(Linking .* )(library|executable) (.*/)+(.+(\.[aso]+)*)$",
           performing, "normal,normal,bold" ],
         # [percent] Built
         [ "^\[\s*[0-9]+%\]\s(Built target)(\s.*)$",
           performed, "normal,bold" ],
         # [percent] Building
-        [ "^\[\s*[0-9]+%\]\s(Building \w* object)(\s.*/)(\w+.c.*)(.o)$",
+        [ "^\[\s*[0-9]+%\]\s(Building \w* object)(\s+.*/)([-\w]+.c.*)(.o)$",
             performing, "normal,normal,bold,normal"],
         # make errors
         [ "make\[[0-9]+\].*", "yellow"],