summaryrefslogtreecommitdiffstats
path: root/Source/cmInstallGenerator.h
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/cmInstallGenerator.h
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/cmInstallGenerator.h')
-rw-r--r--Source/cmInstallGenerator.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmInstallGenerator.h b/Source/cmInstallGenerator.h
index fc1ce86..e5b88c3 100644
--- a/Source/cmInstallGenerator.h
+++ b/Source/cmInstallGenerator.h
@@ -38,6 +38,10 @@ public:
bool exclude_from_all);
~cmInstallGenerator() override;
+ virtual bool HaveInstall();
+ virtual void CheckCMP0082(bool& haveSubdirectoryInstall,
+ bool& haveInstallAfterSubdirectory);
+
void AddInstallRule(
std::ostream& os, std::string const& dest, cmInstallType type,
std::vector<std::string> const& files, bool optional = false,