[Cmake-commits] CMake branch, next, updated. v3.2.2-1866-g0b6e3bc

[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  0b6e3bc038ade69cb945c663416d4f2acece840a (commit)
       via  d19a3ec889c0a74ec256ed62281dcef22f17515b (commit)
      from  6011ea115ef6b87d51179fd606cd98fac1503e92 (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=0b6e3bc038ade69cb945c663416d4f2acece840a
commit 0b6e3bc038ade69cb945c663416d4f2acece840a
Merge: 6011ea1 d19a3ec
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 16 15:24:46 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 16 15:24:46 2015 -0400

    Merge topic 'add-GreenHills-MULTI-generator' into next
    
    d19a3ec8 GHS: changed library project structure


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d19a3ec889c0a74ec256ed62281dcef22f17515b
commit d19a3ec889c0a74ec256ed62281dcef22f17515b
Author:     Geoff Viola <geoffrey.viola at asirobots.com>
AuthorDate: Wed Apr 15 23:12:34 2015 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 16 15:22:18 2015 -0400

    GHS: changed library project structure

diff --git a/Source/cmGhsMultiGpj.cxx b/Source/cmGhsMultiGpj.cxx
index e47d583..e1dce52 100644
--- a/Source/cmGhsMultiGpj.cxx
+++ b/Source/cmGhsMultiGpj.cxx
@@ -22,6 +22,9 @@ void GhsMultiGpj::WriteGpjTag(Types const gpjType,
     case INTERGRITY_APPLICATION:
       tag = "INTEGRITY Application";
       break;
+    case LIBRARY:
+      tag = "Library";
+      break;
     case PROJECT:
       tag = "Project";
       break;
diff --git a/Source/cmGhsMultiGpj.h b/Source/cmGhsMultiGpj.h
index 7e5b942..91ff0f4 100644
--- a/Source/cmGhsMultiGpj.h
+++ b/Source/cmGhsMultiGpj.h
@@ -20,6 +20,7 @@ public:
   enum Types
   {
     INTERGRITY_APPLICATION,
+    LIBRARY,
     PROJECT,
     PROGRAM,
     REFERENCE,
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 0a116ac..01e2011 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -144,7 +144,10 @@ void cmGhsMultiTargetGenerator::Generate()
     this->WriteCompilerFlags(config, language);
     this->WriteCompilerDefinitions(config, language);
     this->WriteIncludes(config, language);
-    this->WriteTargetLinkLibraries();
+    if (this->Target->GetType() == cmTarget::EXECUTABLE)
+      {
+      this->WriteTargetLinkLibraries();
+      }
     this->WriteCustomCommands();
     if (this->DynamicDownload)
       {
@@ -187,6 +190,10 @@ GhsMultiGpj::Types cmGhsMultiTargetGenerator::GetGpjTag(const cmTarget *target)
     {
     output = GhsMultiGpj::INTERGRITY_APPLICATION;
     }
+  else if (target->GetType() == cmTarget::STATIC_LIBRARY)
+    {
+    output = GhsMultiGpj::LIBRARY;
+    }
   else
     {
     output = GhsMultiGpj::PROGRAM;
@@ -209,7 +216,6 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config,
 
   if (this->Target->GetType() == cmTarget::STATIC_LIBRARY)
     {
-    *this->GetFolderBuildStreams() << "    -relobj" << std::endl;
     *this->GetFolderBuildStreams() << "    {optgroup=GhsCommonOptions} -o \""
                                    << outputDir << outputFilename << ".a\""
                                    << std::endl;

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

Summary of changes:
 Source/cmGhsMultiGpj.cxx             |    3 +++
 Source/cmGhsMultiGpj.h               |    1 +
 Source/cmGhsMultiTargetGenerator.cxx |   10 ++++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake