[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4147-gc2d78c1

[Stephen Kelly]

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  c2d78c1b479653571cd0cf62832c5c63534e5157 (commit)
       via  693199999ae8217314db08748b3e588bd93b21b8 (commit)
      from  4efe9018bdc5f005a6ed3a7e4eb8462bbfa925ed (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2d78c1b479653571cd0cf62832c5c63534e5157
commit c2d78c1b479653571cd0cf62832c5c63534e5157
Merge: 4efe901 6931999
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 12 11:04:55 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 12 11:04:55 2013 -0400

    Merge topic 'minor_cleanup' into next
    
    6931999 VS6: Add some delimiting between error message and content.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=693199999ae8217314db08748b3e588bd93b21b8
commit 693199999ae8217314db08748b3e588bd93b21b8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 12 17:04:00 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 12 17:04:00 2013 +0200

    VS6: Add some delimiting between error message and content.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index e5b4057..f00a937 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -147,7 +147,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
         this->SetBuildType(UTILITY, l->first.c_str(), l->second);
         break;
       default:
-        cmSystemTools::Error("Bad target type", l->first.c_str());
+        cmSystemTools::Error("Bad target type: ", l->first.c_str());
         break;
       }
     // INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
@@ -165,7 +165,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
         dir += l->first.substr(0, pos);
         if(!cmSystemTools::MakeDirectory(dir.c_str()))
           {
-          cmSystemTools::Error("Error creating directory ", dir.c_str());
+          cmSystemTools::Error("Error creating directory: ", dir.c_str());
           }
         }
       this->CreateSingleDSP(l->first.c_str(),l->second);

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

Summary of changes:
 Source/cmLocalVisualStudio6Generator.cxx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake