[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-719-gccf1709

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ccf17096071718ea9d7ed75d37fd1e7c8fdad196 (commit)
       via  9f1429e274df81344d260c8e42b3387a402940f1 (commit)
      from  fddee52d5bdf90d806834411062b3af37a6332bc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccf17096071718ea9d7ed75d37fd1e7c8fdad196
commit ccf17096071718ea9d7ed75d37fd1e7c8fdad196
Merge: fddee52 9f1429e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 24 14:05:55 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 24 14:05:55 2016 -0400

    Merge topic 'st2-fix-regex' into next
    
    9f1429e2 Sublime: Update generated diagnostic matching expression for MSVC


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f1429e274df81344d260c8e42b3387a402940f1
commit 9f1429e274df81344d260c8e42b3387a402940f1
Author:     Bruno Pedrosa <brupelo at gmail.com>
AuthorDate: Thu Oct 20 02:35:58 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 24 14:02:52 2016 -0400

    Sublime: Update generated diagnostic matching expression for MSVC
    
    Update the generated `file_regex` to match MSVC-style messages in
    addition to the GCC-style messages already matched.  Use non-capturing
    sub-patterns to tolerate the differences in message formats while still
    capturing the four pieces of information in proper group numbers (file
    name, line number, column number, message).
    
    Closes: #16375

diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 41f82a2..b9e4246 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -271,7 +271,9 @@ void cmExtraSublimeTextGenerator::AppendTarget(
        << this->BuildMakeCommand(make, makefileName.c_str(), targetName)
        << "],\n";
   fout << "\t\t\t\"working_dir\": \"${project_path}\",\n";
-  fout << "\t\t\t\"file_regex\": \"^(..[^:]*):([0-9]+):?([0-9]+)?:? (.*)$\"\n";
+  fout << "\t\t\t\"file_regex\": \""
+          "^(..[^:]*)(?::|\\\\()([0-9]+)(?::|\\\\))(?:([0-9]+):)?\\\\s*(.*)"
+          "\"\n";
   fout << "\t\t}";
 }
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExtraSublimeTextGenerator.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake