diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-10 14:26:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-11-10 14:26:00 (GMT) |
| commit | 556fe92b765ea6d200b76c4e6d35a2147952d9a3 (patch) | |
| tree | 1767e7f816a6bb91968d2f5cf94658926e9f7b35 /Source/cmInstallCommand.cxx | |
| parent | 21684a240186f061237a5445042920decb0fc337 (diff) | |
| parent | 9103d8ace327d34a6bc5085e0ec91abc6e8053f1 (diff) | |
| download | CMake-556fe92b765ea6d200b76c4e6d35a2147952d9a3.zip CMake-556fe92b765ea6d200b76c4e6d35a2147952d9a3.tar.gz CMake-556fe92b765ea6d200b76c4e6d35a2147952d9a3.tar.bz2 | |
Merge topic 'fix-install-rules'
9103d8ac Install: Move SetHaveInstallRule to a more-obvious place
Diffstat (limited to 'Source/cmInstallCommand.cxx')
| -rw-r--r-- | Source/cmInstallCommand.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index 6b06fce..15a83ee 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -27,6 +27,7 @@ static cmInstallTargetGenerator* CreateInstallTargetGenerator(cmTarget& target, { cmInstallGenerator::MessageLevel message = cmInstallGenerator::SelectMessageLevel(target.GetMakefile()); + target.SetHaveInstallRule(true); return new cmInstallTargetGenerator(target.GetName(), args.GetDestination().c_str(), impLib, args.GetPermissions().c_str(), @@ -753,12 +754,6 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args) installsPublicHeader = installsPublicHeader || publicHeaderGenerator != 0; installsResource = installsResource || resourceGenerator; - if (installsArchive || installsRuntime || installsFramework - || installsLibrary || installsBundle) - { - target.SetHaveInstallRule(true); - } - this->Makefile->AddInstallGenerator(archiveGenerator); this->Makefile->AddInstallGenerator(libraryGenerator); this->Makefile->AddInstallGenerator(runtimeGenerator); |