diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-09-23 11:45:17 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-01-05 00:18:37 (GMT) |
| commit | 894f52f32d96ae92df0ba3dac2a70fe9c87e818d (patch) | |
| tree | ac4350fb4cea5b188f7880ea4207d4a4fecbdf7e /Source/cmExportInstallFileGenerator.cxx | |
| parent | f5b1980fb27fa902d37856ec3e22daddfeb9d52f (diff) | |
| download | CMake-894f52f32d96ae92df0ba3dac2a70fe9c87e818d.zip CMake-894f52f32d96ae92df0ba3dac2a70fe9c87e818d.tar.gz CMake-894f52f32d96ae92df0ba3dac2a70fe9c87e818d.tar.bz2 | |
Handle INTERFACE properties transitively for includes and defines.
Contextually, the behavior is as if the properties content from another
target is included in the string and then the result is evaluated.
Diffstat (limited to 'Source/cmExportInstallFileGenerator.cxx')
| -rw-r--r-- | Source/cmExportInstallFileGenerator.cxx | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx index 2b7937e..bc953c9 100644 --- a/Source/cmExportInstallFileGenerator.cxx +++ b/Source/cmExportInstallFileGenerator.cxx @@ -69,6 +69,8 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os) this->GenerateExpectedTargetsCode(os, expectedTargets); } + std::vector<std::string> missingTargets; + // Create all the imported targets. for(std::vector<cmTarget*>::const_iterator tei = allTargets.begin(); @@ -76,8 +78,23 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os) { cmTarget* te = *tei; this->GenerateImportTargetCode(os, te); + + ImportPropertyMap properties; + + this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES", + te, + cmGeneratorExpression::InstallInterface, + properties, missingTargets); + this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", + te, + cmGeneratorExpression::InstallInterface, + properties, missingTargets); + + this->GenerateInterfaceProperties(te, os, properties); } + this->GenerateMissingTargetsCheckCode(os, missingTargets); + // Now load per-configuration properties for them. os << "# Load information for each installed configuration.\n" << "GET_FILENAME_COMPONENT(_DIR \"${CMAKE_CURRENT_LIST_FILE}\" PATH)\n" |