diff options
| author | Brad King <brad.king@kitware.com> | 2012-03-13 13:22:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-03-16 14:18:01 (GMT) |
| commit | c68cc0661218c62f32d11cb600183e645c81a3de (patch) | |
| tree | f5f9ed60ee709ba8d5adc97e38e41dbfe4aab9cf /Source/cmInstallCommand.cxx | |
| parent | 48eb7fc7d7b3fa5570a7b32968fa2cff07bf6fe7 (diff) | |
| parent | 3a53005f7dd5e582b855ef1f3c0e6814ce7d024a (diff) | |
| download | CMake-c68cc0661218c62f32d11cb600183e645c81a3de.zip CMake-c68cc0661218c62f32d11cb600183e645c81a3de.tar.gz CMake-c68cc0661218c62f32d11cb600183e645c81a3de.tar.bz2 | |
Merge branch 'object-library' into ninja-object-library
Diffstat (limited to 'Source/cmInstallCommand.cxx')
| -rw-r--r-- | Source/cmInstallCommand.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index dca528d..c656487 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -357,7 +357,8 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args) if(target->GetType() != cmTarget::EXECUTABLE && target->GetType() != cmTarget::STATIC_LIBRARY && target->GetType() != cmTarget::SHARED_LIBRARY && - target->GetType() != cmTarget::MODULE_LIBRARY) + target->GetType() != cmTarget::MODULE_LIBRARY && + target->GetType() != cmTarget::OBJECT_LIBRARY) { cmOStringStream e; e << "TARGETS given target \"" << (*targetIt) @@ -365,6 +366,14 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args) this->SetError(e.str().c_str()); return false; } + else if(target->GetType() == cmTarget::OBJECT_LIBRARY) + { + cmOStringStream e; + e << "TARGETS given OBJECT library \"" << (*targetIt) + << "\" which may not be installed."; + this->SetError(e.str().c_str()); + return false; + } // Store the target in the list to be installed. targets.push_back(target); } |