[Cmake-commits] CMake branch, next, updated. v3.2.3-1450-g54818a4

[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  54818a44c0d7e5b076b6c6d0dc15413167293297 (commit)
       via  81270fc8fd58da00bde1e25334fdfc6f2e6f1302 (commit)
      from  b094dc58b8bab0f594c517092d1a52e9b7641ec1 (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=54818a44c0d7e5b076b6c6d0dc15413167293297
commit 54818a44c0d7e5b076b6c6d0dc15413167293297
Merge: b094dc5 81270fc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 3 14:30:16 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 3 14:30:16 2015 -0400

    Merge topic 'remove-CMAKE_USE_RELATIVE_PATHS' into next
    
    81270fc8 fixup! cmLocalGenerator: Remove 'optional' parameter from Convert.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81270fc8fd58da00bde1e25334fdfc6f2e6f1302
commit 81270fc8fd58da00bde1e25334fdfc6f2e6f1302
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jun 3 20:08:25 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 3 14:28:12 2015 -0400

    fixup! cmLocalGenerator: Remove 'optional' parameter from Convert.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index a39d940..c686ab1 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1313,8 +1313,7 @@ std::string cmLocalGenerator::GetIncludeFlags(
           {
           includeFlags << fwSearchFlag;
           }
-        includeFlags << this->Convert(frameworkDir, START_OUTPUT,
-                                      shellFormat)
+        includeFlags << this->ConvertToOutputFormat(frameworkDir, shellFormat)
           << " ";
         }
       continue;

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

Summary of changes:
 Source/cmLocalGenerator.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
CMake