summaryrefslogtreecommitdiffstats
path: root/Source/cmInstallScriptGenerator.cxx
diff options
context:
space:
mode:
authorKyle Edwards <kyle.edwards@kitware.com>2018-10-02 20:38:26 (GMT)
committerKyle Edwards <kyle.edwards@kitware.com>2018-10-10 14:26:39 (GMT)
commitfc8955e8891c645cd369a3cc8b607a14a8ed5bd7 (patch)
tree8a20a759ac2ea54aae9411bad8c54d109dd1ae02 /Source/cmInstallScriptGenerator.cxx
parent514f0b572ea8ca2ba87810aa8f48185f266a8eaa (diff)
downloadCMake-fc8955e8891c645cd369a3cc8b607a14a8ed5bd7.zip
CMake-fc8955e8891c645cd369a3cc8b607a14a8ed5bd7.tar.gz
CMake-fc8955e8891c645cd369a3cc8b607a14a8ed5bd7.tar.bz2
add_subdirectory: Run subdirectory install rules in correct order
Before this change, install rules created by add_subdirectory() would be executed after all of the top-level install rules, even if they were declared before the top-level rules. This change adds a new policy, CMP0082, which interleaves the add_subdirectory() install rules with the other install rules so they are run in the correct order.
Diffstat (limited to 'Source/cmInstallScriptGenerator.cxx')
-rw-r--r--Source/cmInstallScriptGenerator.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmInstallScriptGenerator.cxx b/Source/cmInstallScriptGenerator.cxx
index 3a90f4c..1d7784e 100644
--- a/Source/cmInstallScriptGenerator.cxx
+++ b/Source/cmInstallScriptGenerator.cxx
@@ -37,9 +37,9 @@ void cmInstallScriptGenerator::AddScriptInstallRule(std::ostream& os,
std::string const& script)
{
if (this->Code) {
- os << indent.Next() << script << "\n";
+ os << indent << script << "\n";
} else {
- os << indent.Next() << "include(\"" << script << "\")\n";
+ os << indent << "include(\"" << script << "\")\n";
}
}