[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1114-g20870b7
Stephen Kelly
steveire at gmail.com
Thu Nov 29 09:26:31 EST 2012
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 20870b7079d68194eb9735f646463afea9459d86 (commit)
via f9deedc832479dbf2d8bbf779156208305c37aab (commit)
from 9f476fd352f60a846f605bab00477e3711024de5 (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=20870b7079d68194eb9735f646463afea9459d86
commit 20870b7079d68194eb9735f646463afea9459d86
Merge: 9f476fd f9deedc
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 29 09:26:26 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 29 09:26:26 2012 -0500
Merge topic 'fix-add-INTERFACE_LINK_LIBRARIES-property' into next
f9deedc Export: Generate both old and new-style LINK_INTERFACE prooperties.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9deedc832479dbf2d8bbf779156208305c37aab
commit f9deedc832479dbf2d8bbf779156208305c37aab
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 29 13:58:15 2012 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 29 15:24:31 2012 +0100
Export: Generate both old and new-style LINK_INTERFACE prooperties.
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index f943584..c67486a 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -28,41 +28,27 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
tei = this->Exports->begin();
tei != this->Exports->end(); ++tei)
{
- if ((*tei)->GetPolicyStatusCMP0019() == cmPolicies::NEW)
- {
- os << "IF(NOT POLICY CMP0019)\n"
- << " MESSAGE(FATAL_ERROR \"CMake >= 2.8.11 required to use "
- "IMPORTED targets containing generator expressions\")\n"
- << "ENDIF(NOT POLICY CMP0019)\n";
- break;
- }
- }
-
- for(std::vector<cmTarget*>::const_iterator
- tei = this->Exports->begin();
- tei != this->Exports->end(); ++tei)
- {
cmTarget* te = *tei;
if(this->ExportedTargets.insert(te).second)
{
this->GenerateImportTargetCode(os, te);
+ ImportPropertyMap properties;
+
if ((*tei)->GetPolicyStatusCMP0019() == cmPolicies::NEW)
{
- ImportPropertyMap properties;
-
- this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES", te,
- cmGeneratorExpression::BuildInterface,
- properties);
- this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", te,
- cmGeneratorExpression::BuildInterface,
- properties);
this->PopulateInterfaceProperty("INTERFACE_LINK_LIBRARIES", te,
cmGeneratorExpression::BuildInterface,
properties);
-
- this->GenerateInterfaceProperties(te, os, properties);
}
+ this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES", te,
+ cmGeneratorExpression::BuildInterface,
+ properties);
+ this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", te,
+ cmGeneratorExpression::BuildInterface,
+ properties);
+
+ this->GenerateInterfaceProperties(te, os, properties);
}
else
{
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 50db180..a67c3ee 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -211,13 +211,9 @@ cmExportFileGenerator
this->SetImportLinkProperty(suffix, target,
"IMPORTED_LINK_INTERFACE_LANGUAGES",
iface->Languages, properties, missingTargets);
-
- if(target->GetPolicyStatusCMP0019() != cmPolicies::NEW)
- {
- this->SetImportLinkProperty(suffix, target,
+ this->SetImportLinkProperty(suffix, target,
"IMPORTED_LINK_INTERFACE_LIBRARIES",
iface->Libraries, properties, missingTargets);
- }
this->SetImportLinkProperty(suffix, target,
"IMPORTED_LINK_DEPENDENT_LIBRARIES",
iface->SharedDeps, properties, missingTargets);
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 40606be..c22abf4 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -40,20 +40,6 @@ std::string cmExportInstallFileGenerator::GetConfigImportFileGlob()
//----------------------------------------------------------------------------
bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
{
- for(std::vector<cmTargetExport*>::const_iterator
- tei = this->IEGen->GetExportSet()->GetTargetExports()->begin();
- tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei)
- {
- if ((*tei)->Target->GetPolicyStatusCMP0019() == cmPolicies::NEW)
- {
- os << "IF(NOT POLICY CMP0019)\n"
- << " MESSAGE(FATAL_ERROR \"CMake >= 2.8.11 required to use "
- "IMPORTED targets containing generator expressions\")\n"
- << "ENDIF(NOT POLICY CMP0019)\n";
- break;
- }
- }
-
// Create all the imported targets.
for(std::vector<cmTargetExport*>::const_iterator
tei = this->IEGen->GetExportSet()->GetTargetExports()->begin();
@@ -64,25 +50,25 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
{
this->GenerateImportTargetCode(os, te->Target);
+ ImportPropertyMap properties;
+
if ((*tei)->Target->GetPolicyStatusCMP0019() == cmPolicies::NEW)
{
- ImportPropertyMap properties;
-
- this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES",
- te->Target,
- cmGeneratorExpression::InstallInterface,
- properties);
- this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS",
- te->Target,
- cmGeneratorExpression::InstallInterface,
- properties);
this->PopulateInterfaceProperty("INTERFACE_LINK_LIBRARIES",
te->Target,
cmGeneratorExpression::InstallInterface,
properties);
-
- this->GenerateInterfaceProperties(te->Target, os, properties);
}
+ this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES",
+ te->Target,
+ cmGeneratorExpression::InstallInterface,
+ properties);
+ this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS",
+ te->Target,
+ cmGeneratorExpression::InstallInterface,
+ properties);
+
+ this->GenerateInterfaceProperties(te->Target, os, properties);
}
else
{
-----------------------------------------------------------------------
Summary of changes:
Source/cmExportBuildFileGenerator.cxx | 34 ++++++++-------------------
Source/cmExportFileGenerator.cxx | 6 +----
Source/cmExportInstallFileGenerator.cxx | 38 +++++++++---------------------
3 files changed, 23 insertions(+), 55 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list