[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-602-g91af161

[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  91af161d5fe10ad40c5fcc36ed7629b7a34c01be (commit)
       via  442b08a7a9ba15267d2484feb34d24b77b666b5c (commit)
      from  4553da69ac86c7b3cfaccdeee93fee38a2a7c28b (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=91af161d5fe10ad40c5fcc36ed7629b7a34c01be
commit 91af161d5fe10ad40c5fcc36ed7629b7a34c01be
Merge: 4553da6 442b08a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 7 09:15:13 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 7 09:15:13 2014 -0500

    Merge topic 'dev/string-apis' into next
    
    442b08a7 stringapi: Do not pass NULL language to JoinDefines in VS6


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=442b08a7a9ba15267d2484feb34d24b77b666b5c
commit 442b08a7a9ba15267d2484feb34d24b77b666b5c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 7 09:14:42 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 7 09:14:42 2014 -0500

    stringapi: Do not pass NULL language to JoinDefines in VS6

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index aa025b1..f1fd994 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1742,11 +1742,11 @@ void cmLocalVisualStudio6Generator
     std::string minsizeDefines = " ";
     std::string debugrelDefines = " ";
 
-    this->JoinDefines(definesSet, defines, 0);
-    this->JoinDefines(debugDefinesSet, debugDefines, 0);
-    this->JoinDefines(releaseDefinesSet, releaseDefines, 0);
-    this->JoinDefines(minsizeDefinesSet, minsizeDefines, 0);
-    this->JoinDefines(debugrelDefinesSet, debugrelDefines, 0);
+    this->JoinDefines(definesSet, defines, "");
+    this->JoinDefines(debugDefinesSet, debugDefines, "");
+    this->JoinDefines(releaseDefinesSet, releaseDefines, "");
+    this->JoinDefines(minsizeDefinesSet, minsizeDefines, "");
+    this->JoinDefines(debugrelDefinesSet, debugrelDefines, "");
 
     flags += defines;
     flagsDebug += debugDefines;

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

Summary of changes:
 Source/cmLocalVisualStudio6Generator.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake