[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-247-g893ce30

[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, master has been updated
       via  893ce307f9a9f50dbd324a4c72b833e4a3649b0a (commit)
       via  ce7ccafce29a618392e05f99881c41f4a4a07125 (commit)
      from  02f8d51f48ae4abfec5491a8ab47be35a6671bab (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=893ce307f9a9f50dbd324a4c72b833e4a3649b0a
commit 893ce307f9a9f50dbd324a4c72b833e4a3649b0a
Merge: 02f8d51 ce7ccaf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 16 09:35:41 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 16 09:35:41 2015 -0400

    Merge topic 'ghs-drop-optgroup'
    
    ce7ccafc GHS: Remove extra flag to GHS MULTI compiler (#15771)

diff --cc Source/cmGhsMultiTargetGenerator.cxx
index d6cbf75,be54220..c687ba7
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@@ -215,9 -215,9 +215,9 @@@ void cmGhsMultiTargetGenerator::WriteTy
    std::string outputDir(this->GetOutputDirectory(config));
    std::string outputFilename(this->GetOutputFilename(config));
  
 -  if (this->Target->GetType() == cmTarget::STATIC_LIBRARY)
 +  if (this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY)
      {
-     *this->GetFolderBuildStreams() << "    {optgroup=GhsCommonOptions} -o \""
+     *this->GetFolderBuildStreams() << "    -o \""
                                     << outputDir << outputFilename << ".a\""
                                     << std::endl;
      }

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

Summary of changes:
 Source/cmGhsMultiTargetGenerator.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake