diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-09 13:21:59 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-09 13:22:06 (GMT) |
| commit | 40f4147224dd6f3839a224f89dc85f357176fd2f (patch) | |
| tree | af6ba66a362f912eecd0f3cf2ec50c115c4b83f0 /Source | |
| parent | 9b9075f7237c92acb70a9495b55f8ca356cf90fa (diff) | |
| parent | 4d46b1401f9d1624fa5afc3995844d7aebc7ccf4 (diff) | |
| download | CMake-40f4147224dd6f3839a224f89dc85f357176fd2f.zip CMake-40f4147224dd6f3839a224f89dc85f357176fd2f.tar.gz CMake-40f4147224dd6f3839a224f89dc85f357176fd2f.tar.bz2 | |
Merge topic 'object-lib-multiarch'
4d46b1401f add_library(): Allow imported object libraries with multi-arch
1a915e8953 Tests: TargetObjects does not need any languages enabled
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5771
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmAddLibraryCommand.cxx | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx index f262fac..92e04e4 100644 --- a/Source/cmAddLibraryCommand.cxx +++ b/Source/cmAddLibraryCommand.cxx @@ -238,16 +238,6 @@ bool cmAddLibraryCommand(std::vector<std::string> const& args, status.SetError("called with IMPORTED argument but no library type."); return false; } - if (type == cmStateEnums::OBJECT_LIBRARY) { - std::string reason; - if (!mf.GetGlobalGenerator()->HasKnownObjectFileLocation(&reason)) { - mf.IssueMessage( - MessageType::FATAL_ERROR, - "The OBJECT library type may not be used for IMPORTED libraries" + - reason + "."); - return true; - } - } if (type == cmStateEnums::INTERFACE_LIBRARY) { if (!cmGeneratorExpression::IsValidTargetName(libName)) { status.SetError(cmStrCat( |