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/cmMakefile.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/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 8d163b7..0a69d09 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -28,6 +28,7 @@ #include "cmGeneratorExpressionEvaluationFile.h" #include "cmGlobalGenerator.h" #include "cmInstallGenerator.h" // IWYU pragma: keep +#include "cmInstallSubdirectoryGenerator.h" #include "cmListFileCache.h" #include "cmSourceFile.h" #include "cmSourceFileLocation.h" @@ -1669,6 +1670,9 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath, } else { this->UnConfiguredDirectories.push_back(subMf); } + + this->AddInstallGenerator(new cmInstallSubdirectoryGenerator( + subMf, binPath.c_str(), excludeFromAll)); } const std::string& cmMakefile::GetCurrentSourceDirectory() const |