[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1591-g34370c2

[Stephen Kelly]

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  34370c2065fb9002cc70c8d676d9f0028c1ca6cb (commit)
       via  4d4f765ae8294e9fad2dfc5a570d2491b5382f7c (commit)
      from  39b62a93978dfec10c05e1531e790c427526bdaa (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=34370c2065fb9002cc70c8d676d9f0028c1ca6cb
commit 34370c2065fb9002cc70c8d676d9f0028c1ca6cb
Merge: 39b62a9 4d4f765
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 13 04:51:45 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 13 04:51:45 2013 -0500

    Merge topic 'test-export-iface-genex' into next
    
    4d4f765 Remove definition of method.

diff --cc Source/cmExportFileGenerator.cxx
index 61c99dd,94e24c7..4a7c6f9
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@@ -122,31 -121,7 +122,19 @@@ void cmExportFileGenerator::GenerateImp
      }
  
    // Generate the per-config target information.
 -  this->GenerateImportTargetsConfig(os, config, suffix);
 +  this->GenerateImportTargetsConfig(os, config, suffix, missingTargets);
 +}
 +
 +//----------------------------------------------------------------------------
 +void cmExportFileGenerator::PopulateInterfaceProperty(const char *propName,
 +                                              cmTarget *target,
 +                                              ImportPropertyMap &properties)
- {
-   const char *input = target->GetProperty(propName);
-   if (input)
-     {
-     properties[propName] = input;
-     }
- }
- 
- //----------------------------------------------------------------------------
- void cmExportFileGenerator::PopulateInterfaceProperty(const char *propName,
-                                               cmTarget *target,
-                                               ImportPropertyMap &properties)
 +{
 +  const char *input = target->GetProperty(propName);
 +  if (input)
 +    {
 +    properties[propName] = input;
 +    }
  }
  
  //----------------------------------------------------------------------------

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d4f765ae8294e9fad2dfc5a570d2491b5382f7c
commit 4d4f765ae8294e9fad2dfc5a570d2491b5382f7c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 13 10:47:48 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jan 13 10:50:53 2013 +0100

    Remove definition of method.
    
    When merging to next, it is being duplicated, apparently as conflict
    resolution with the export-cleanups branch.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 6b2934a..94e24c7 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -126,18 +126,6 @@ void cmExportFileGenerator::GenerateImportConfig(std::ostream& os,
 
 //----------------------------------------------------------------------------
 void cmExportFileGenerator::PopulateInterfaceProperty(const char *propName,
-                                              cmTarget *target,
-                                              ImportPropertyMap &properties)
-{
-  const char *input = target->GetProperty(propName);
-  if (input)
-    {
-    properties[propName] = input;
-    }
-}
-
-//----------------------------------------------------------------------------
-void cmExportFileGenerator::PopulateInterfaceProperty(const char *propName,
                       const char *outputName,
                       cmTarget *target,
                       cmGeneratorExpression::PreprocessContext preprocessRule,

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

Summary of changes:
 Source/cmExportFileGenerator.cxx |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake