diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-23 11:30:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-23 11:30:53 (GMT) |
| commit | 5396c5fce4eae4f4b0a9b974e0a0304c7afda459 (patch) | |
| tree | ea6b29048aba2ecbb003632a745560ad09687a6a /Source | |
| parent | 6f476a41697eab23c46a33d93f5a17138c79dad2 (diff) | |
| parent | 680a3c63bb3a6485a1774a457f3f2a63ad96b728 (diff) | |
| download | CMake-5396c5fce4eae4f4b0a9b974e0a0304c7afda459.zip CMake-5396c5fce4eae4f4b0a9b974e0a0304c7afda459.tar.gz CMake-5396c5fce4eae4f4b0a9b974e0a0304c7afda459.tar.bz2 | |
Merge topic 'make-imported-targets-more-equal'
680a3c63bb target_*: Allow setting INTERFACE properties of UNKNOWN IMPORTED targets
62b5d1e4ad cmTargetPropCommandBase: Order target type condition by order in enum
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3581
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmTargetPropCommandBase.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmTargetPropCommandBase.cxx b/Source/cmTargetPropCommandBase.cxx index 1b8ee81..3aa845c 100644 --- a/Source/cmTargetPropCommandBase.cxx +++ b/Source/cmTargetPropCommandBase.cxx @@ -32,12 +32,13 @@ bool cmTargetPropCommandBase::HandleArguments( this->HandleMissingTarget(args[0]); return false; } - if ((this->Target->GetType() != cmStateEnums::SHARED_LIBRARY) && + if ((this->Target->GetType() != cmStateEnums::EXECUTABLE) && (this->Target->GetType() != cmStateEnums::STATIC_LIBRARY) && - (this->Target->GetType() != cmStateEnums::OBJECT_LIBRARY) && + (this->Target->GetType() != cmStateEnums::SHARED_LIBRARY) && (this->Target->GetType() != cmStateEnums::MODULE_LIBRARY) && + (this->Target->GetType() != cmStateEnums::OBJECT_LIBRARY) && (this->Target->GetType() != cmStateEnums::INTERFACE_LIBRARY) && - (this->Target->GetType() != cmStateEnums::EXECUTABLE)) { + (this->Target->GetType() != cmStateEnums::UNKNOWN_LIBRARY)) { this->SetError("called with non-compilable target type"); return false; } |