[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-579-g8709f88

[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  8709f887f1565054381b8eed3c525f5192dc244b (commit)
       via  ce7ccafce29a618392e05f99881c41f4a4a07125 (commit)
       via  8e394cf9e39babefdc991b67fa4fd1921735eb7e (commit)
      from  1c7f65b28d6b12a4a3f7bf0dca56fb4ef4fcf386 (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=8709f887f1565054381b8eed3c525f5192dc244b
commit 8709f887f1565054381b8eed3c525f5192dc244b
Merge: 1c7f65b ce7ccaf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 15 10:07:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 15 10:07:56 2015 -0400

    Merge topic 'ghs-drop-optgroup' into next
    
    ce7ccafc GHS: Remove extra flag to GHS MULTI compiler (#15771)
    8e394cf9 CMake Nightly Date Stamp

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;
      }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce7ccafce29a618392e05f99881c41f4a4a07125
commit ce7ccafce29a618392e05f99881c41f4a4a07125
Author:     Geoff Viola <geoffrey.viola at asirobots.com>
AuthorDate: Wed Oct 14 00:27:18 2015 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 15 09:56:47 2015 -0400

    GHS: Remove extra flag to GHS MULTI compiler (#15771)
    
    Do not produce "{optgroup=GhsCommonOptions}" in the generated .gpj
    files.  The flag was added originally to match an old project file, but
    it does not seem necessary and is not compatible with all GHS versions.

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 79e3a4c..be54220 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -217,7 +217,7 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config,
 
   if (this->Target->GetType() == cmTarget::STATIC_LIBRARY)
     {
-    *this->GetFolderBuildStreams() << "    {optgroup=GhsCommonOptions} -o \""
+    *this->GetFolderBuildStreams() << "    -o \""
                                    << outputDir << outputFilename << ".a\""
                                    << std::endl;
     }
@@ -230,7 +230,7 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config,
     if (this->IsTargetGroup())
       {
       *this->GetFolderBuildStreams()
-          << "    {optgroup=GhsCommonOptions} -o \"" << outputDir
+          << "    -o \"" << outputDir
           << outputFilename << ".elf\"" << std::endl;
       *this->GetFolderBuildStreams() << "    :extraOutputFile=\"" << outputDir
                                      << outputFilename << ".elf.ael\""
@@ -238,7 +238,7 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config,
       }
     else
       {
-      *this->GetFolderBuildStreams() << "    {optgroup=GhsCommonOptions} -o \""
+      *this->GetFolderBuildStreams() << "    -o \""
                                      << outputDir << outputFilename << ".as\""
                                      << std::endl;
       }

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

Summary of changes:
 Source/CMakeVersion.cmake            |    2 +-
 Source/cmGhsMultiTargetGenerator.cxx |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake