diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2018-10-02 20:38:26 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2018-10-10 14:26:39 (GMT) |
| commit | fc8955e8891c645cd369a3cc8b607a14a8ed5bd7 (patch) | |
| tree | 8a20a759ac2ea54aae9411bad8c54d109dd1ae02 /Source/cmInstallGenerator.cxx | |
| parent | 514f0b572ea8ca2ba87810aa8f48185f266a8eaa (diff) | |
| download | CMake-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/cmInstallGenerator.cxx')
| -rw-r--r-- | Source/cmInstallGenerator.cxx | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx index 53ac716..2b23658 100644 --- a/Source/cmInstallGenerator.cxx +++ b/Source/cmInstallGenerator.cxx @@ -22,6 +22,19 @@ cmInstallGenerator::~cmInstallGenerator() { } +bool cmInstallGenerator::HaveInstall() +{ + return true; +} + +void cmInstallGenerator::CheckCMP0082(bool& haveSubdirectoryInstall, + bool& haveInstallAfterSubdirectory) +{ + if (haveSubdirectoryInstall) { + haveInstallAfterSubdirectory = true; + } +} + void cmInstallGenerator::AddInstallRule( std::ostream& os, std::string const& dest, cmInstallType type, std::vector<std::string> const& files, bool optional /* = false */, |