[Cmake-commits] CMake branch, next, updated. v3.2.3-1446-g291c024

[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  291c02429ce1df2e0d080c85562319d8a9fc5d9c (commit)
       via  6769105151ee3e30b51d82f4b837e50a530b7cc0 (commit)
      from  a485d7e5d7e19f45f2bd01f1b5f0598c0ce670cc (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=291c02429ce1df2e0d080c85562319d8a9fc5d9c
commit 291c02429ce1df2e0d080c85562319d8a9fc5d9c
Merge: a485d7e 6769105
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 3 12:27:43 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 3 12:27:43 2015 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6769105151ee3e30b51d82f4b837e50a530b7cc0
commit 6769105151ee3e30b51d82f4b837e50a530b7cc0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 3 12:27:21 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 3 12:27:21 2015 -0400

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

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index a35737f..a39d940 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1191,6 +1191,8 @@ cmLocalGenerator::ConvertToOutputForExisting(const std::string& remote,
                                              RelativeRoot local,
                                              OutputFormat format)
 {
+  static_cast<void>(local);
+
   // Perform standard conversion.
   std::string result = this->ConvertToOutputFormat(remote, format);
 

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

Summary of changes:
 Source/cmLocalGenerator.cxx |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake