[Cmake-commits] CMake branch, next, updated. v3.2.1-1698-g3eca0b0

Brad King brad.king at kitware.com
Fri Apr 10 08:23:31 EDT 2015


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  3eca0b0fe2b29fba1195a43dfd6d987f72e1b97e (commit)
       via  c97510187e1664af636b89140ed6e82ead1cf966 (commit)
      from  23c3113c85a6c96d47a092c2a92b40fae63f2aff (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=3eca0b0fe2b29fba1195a43dfd6d987f72e1b97e
commit 3eca0b0fe2b29fba1195a43dfd6d987f72e1b97e
Merge: 23c3113 c975101
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 10 08:23:30 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 10 08:23:30 2015 -0400

    Merge topic 'add-GreenHills-MULTI-generator' into next
    
    c9751018 fixup! Add a 'Green Hills MULTI' generator on Windows


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c97510187e1664af636b89140ed6e82ead1cf966
commit c97510187e1664af636b89140ed6e82ead1cf966
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 10 08:20:11 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 10 08:20:11 2015 -0400

    fixup! Add a 'Green Hills MULTI' generator on Windows

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index e01c851..2637675 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -300,7 +300,7 @@ std::string cmGhsMultiTargetGenerator::GetDefines(const std::string &language,
   return i->second;
 }
 
-void cmGhsMultiTargetGenerator::WriteCompilerFlags(std::string const &config,
+void cmGhsMultiTargetGenerator::WriteCompilerFlags(std::string const &,
                                                    const std::string &language)
 {
   //this->Target->GetCompileOptions(options, config, language);

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

Summary of changes:
 Source/cmGhsMultiTargetGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list