diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-26 13:02:10 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-26 13:02:10 (GMT) |
| commit | 22fbeaa14b5d79bc065b1c3061359c886167cc01 (patch) | |
| tree | 1feb8edfda420dc840514253df25ee19eb2b697e /Source | |
| parent | 1c517989405d7a25e669a25fd20f97fb112d279e (diff) | |
| parent | 77ff352aa76e4b5e8b739b3098aa98b14acba8d6 (diff) | |
| download | CMake-22fbeaa14b5d79bc065b1c3061359c886167cc01.zip CMake-22fbeaa14b5d79bc065b1c3061359c886167cc01.tar.gz CMake-22fbeaa14b5d79bc065b1c3061359c886167cc01.tar.bz2 | |
Merge topic 'export-COMPILE_OPTIONS-property'
77ff352 Generate INTERFACE_COMPILE_OPTIONS on export.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmExportBuildFileGenerator.cxx | 3 | ||||
| -rw-r--r-- | Source/cmExportInstallFileGenerator.cxx | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx index 39184fb..326663c 100644 --- a/Source/cmExportBuildFileGenerator.cxx +++ b/Source/cmExportBuildFileGenerator.cxx @@ -72,6 +72,9 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os) this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", te, cmGeneratorExpression::BuildInterface, properties, missingTargets); + this->PopulateInterfaceProperty("INTERFACE_COMPILE_OPTIONS", te, + cmGeneratorExpression::BuildInterface, + properties, missingTargets); this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE", te, properties); this->PopulateCompatibleInterfaceProperties(te, properties); diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx index ea671cc..a966b16 100644 --- a/Source/cmExportInstallFileGenerator.cxx +++ b/Source/cmExportInstallFileGenerator.cxx @@ -130,6 +130,10 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os) te, cmGeneratorExpression::InstallInterface, properties, missingTargets); + this->PopulateInterfaceProperty("INTERFACE_COMPILE_OPTIONS", + te, + cmGeneratorExpression::InstallInterface, + properties, missingTargets); this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE", te, properties); this->PopulateCompatibleInterfaceProperties(te, properties); |