diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2019-02-26 22:28:04 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2019-02-26 22:28:04 (GMT) |
| commit | e795be115e9c40d6092958d64f251db435acc4ba (patch) | |
| tree | 1474474ff28bcdcfd1fe0c64a2d4431e740266d7 /Source/cmComputeLinkInformation.cxx | |
| parent | 4b95e7fe63d254b8e50f09f85a51e232a7470c7b (diff) | |
| parent | 78ff8d573777c099aea5bd2eb92d9866c0d85952 (diff) | |
| download | CMake-e795be115e9c40d6092958d64f251db435acc4ba.zip CMake-e795be115e9c40d6092958d64f251db435acc4ba.tar.gz CMake-e795be115e9c40d6092958d64f251db435acc4ba.tar.bz2 | |
Merge branch 'master' into cmake_role-vs-fix
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 3d61665..44d8615 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -457,8 +457,8 @@ bool cmComputeLinkInformation::Compute() // We require a link language for the target. if (this->LinkLanguage.empty()) { cmSystemTools::Error( - "CMake can not determine linker language for target: ", - this->Target->GetName().c_str()); + "CMake can not determine linker language for target: " + + this->Target->GetName()); return false; } @@ -1266,7 +1266,7 @@ void cmComputeLinkInformation::AddFrameworkItem(std::string const& item) void cmComputeLinkInformation::AddDirectoryItem(std::string const& item) { if (this->Makefile->IsOn("APPLE") && - cmSystemTools::IsPathToFramework(item.c_str())) { + cmSystemTools::IsPathToFramework(item)) { this->AddFrameworkItem(item); } else { this->DropDirectoryItem(item); |