[Cmake-commits] CMake branch, next, updated. v3.3.2-1425-ge72bb58

[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  e72bb585d8cb967d0471f3d5067cce0784054340 (commit)
       via  d945b36a93ab9f935c4e369d5c75be8b47d48f7a (commit)
       via  48f8b6acf3a8083b5a52bbe1ec3adc10c515d710 (commit)
      from  a8265810e35ddfcb3d6fe8e979bcb2b810e5a885 (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=e72bb585d8cb967d0471f3d5067cce0784054340
commit e72bb585d8cb967d0471f3d5067cce0784054340
Merge: a826581 d945b36
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 12:43:08 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 12:43:08 2015 -0400

    Merge topic 'cmGeneratorTarget-exports' into next
    
    d945b36a cmExportTryCompileFileGenerator: Evaluate genex with cmGeneratorTarget.
    48f8b6ac cmExportFileGenerator: Evaluate genex with cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d945b36a93ab9f935c4e369d5c75be8b47d48f7a
commit d945b36a93ab9f935c4e369d5c75be8b47d48f7a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 01:08:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:42:27 2015 +0200

    cmExportTryCompileFileGenerator: Evaluate genex with cmGeneratorTarget.

diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index ba66531..026584c 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -76,8 +76,12 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
   dummyHead.SetType(cmTarget::EXECUTABLE, "try_compile_dummy_exe");
   dummyHead.SetMakefile(tgt->GetMakefile());
 
-  std::string result = cge->Evaluate(tgt->GetMakefile(), this->Config,
-                                     false, &dummyHead, tgt, &dagChecker);
+  cmGeneratorTarget* gtgt =
+      tgt->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(tgt);
+
+  std::string result = cge->Evaluate(gtgt->Target->GetMakefile(), this->Config,
+                                     false, &dummyHead,
+                                     gtgt->Target, &dagChecker);
 
   const std::set<cmTarget const*> &allTargets = cge->GetAllTargetsSeen();
   for(std::set<cmTarget const*>::const_iterator li = allTargets.begin();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48f8b6acf3a8083b5a52bbe1ec3adc10c515d710
commit 48f8b6acf3a8083b5a52bbe1ec3adc10c515d710
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 01:07:03 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:42:27 2015 +0200

    cmExportFileGenerator: Evaluate genex with cmGeneratorTarget.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 9a7d73f..881acee 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -436,7 +436,9 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
 {
-  cmTarget *target = tei->Target;
+  cmGeneratorTarget *target = tei->Target->GetMakefile()
+                                 ->GetGlobalGenerator()
+                                 ->GetGeneratorTarget(tei->Target);
   assert(preprocessRule == cmGeneratorExpression::InstallInterface);
 
   const char *propName = "INTERFACE_INCLUDE_DIRECTORIES";
@@ -450,12 +452,12 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                                             true);
   this->ReplaceInstallPrefix(dirs);
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(dirs);
-  std::string exportDirs = cge->Evaluate(target->GetMakefile(), "",
-                                         false, target);
+  std::string exportDirs = cge->Evaluate(target->Target->GetMakefile(), "",
+                                         false, target->Target);
 
   if (cge->GetHadContextSensitiveCondition())
     {
-    cmMakefile* mf = target->GetMakefile();
+    cmMakefile* mf = target->Target->GetMakefile();
     std::ostringstream e;
     e << "Target \"" << target->GetName() << "\" is installed with "
     "INCLUDES DESTINATION set to a context sensitive path.  Paths which "
@@ -486,10 +488,10 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                                                          true);
   if (!prepro.empty())
     {
-    this->ResolveTargetsInGeneratorExpressions(prepro, target,
+    this->ResolveTargetsInGeneratorExpressions(prepro, target->Target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target, propName))
+    if (!checkInterfaceDirs(prepro, target->Target, propName))
       {
       return;
       }

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

Summary of changes:
 Source/cmExportFileGenerator.cxx           |   14 ++++++++------
 Source/cmExportTryCompileFileGenerator.cxx |    8 ++++++--
 2 files changed, 14 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake