diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-20 12:51:09 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-20 12:51:09 (GMT) |
| commit | a5f4463eedc31f6f552b7f7837212661349898df (patch) | |
| tree | 201aa79bedda91071ee8710d1b2b3f69f3e19047 /Source/cmTarget.cxx | |
| parent | 92c3cab223845ca83533bba7b6d73f6180223935 (diff) | |
| parent | effa6c8343fb871574cb5471de5eb4c1705dd334 (diff) | |
| download | CMake-a5f4463eedc31f6f552b7f7837212661349898df.zip CMake-a5f4463eedc31f6f552b7f7837212661349898df.tar.gz CMake-a5f4463eedc31f6f552b7f7837212661349898df.tar.bz2 | |
Merge topic 'clang-tidy'
effa6c83 fix more issues reported by clang-tidy
fb461cac silence selected clang-tidy violations
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index e2ee3a5..3718d95 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -855,13 +855,15 @@ void cmTarget::SetProperty(const std::string& prop, const char* value) e << "NAME property is read-only\n"; this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); return; - } else if (prop == "EXPORT_NAME" && this->IsImported()) { + } + if (prop == "EXPORT_NAME" && this->IsImported()) { std::ostringstream e; e << "EXPORT_NAME property can't be set on imported targets (\"" << this->Name << "\")\n"; this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); return; - } else if (prop == "SOURCES" && this->IsImported()) { + } + if (prop == "SOURCES" && this->IsImported()) { std::ostringstream e; e << "SOURCES property can't be set on imported targets (\"" << this->Name << "\")\n"; @@ -935,13 +937,15 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value, e << "NAME property is read-only\n"; this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); return; - } else if (prop == "EXPORT_NAME" && this->IsImported()) { + } + if (prop == "EXPORT_NAME" && this->IsImported()) { std::ostringstream e; e << "EXPORT_NAME property can't be set on imported targets (\"" << this->Name << "\")\n"; this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); return; - } else if (prop == "SOURCES" && this->IsImported()) { + } + if (prop == "SOURCES" && this->IsImported()) { std::ostringstream e; e << "SOURCES property can't be set on imported targets (\"" << this->Name << "\")\n"; |