diff options
| author | Brad King <brad.king@kitware.com> | 2019-12-17 16:08:06 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-12-17 16:09:20 (GMT) |
| commit | 64e2891cbddcfa491b9158e479db16114aeabc33 (patch) | |
| tree | be5274274d66e083fe265e50380e36037e2a8e26 /Source/cmTarget.cxx | |
| parent | 7d69ab02adcad7baf72facd2c29ef232d230ce01 (diff) | |
| parent | c34b4497f8d595390d8e5a9d216de9ddc95a47eb (diff) | |
| download | CMake-64e2891cbddcfa491b9158e479db16114aeabc33.zip CMake-64e2891cbddcfa491b9158e479db16114aeabc33.tar.gz CMake-64e2891cbddcfa491b9158e479db16114aeabc33.tar.bz2 | |
Merge topic 'stdstring-target'
c34b4497f8 cmTarget: add std::string overloads
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4137
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 6441c0e..1577839 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -951,9 +951,8 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf, std::string const& lib, (isNonImportedTarget && llt != GENERAL_LibraryType) ? targetNameGenex(libRef) : libRef; - this->AppendProperty( - "LINK_LIBRARIES", - this->GetDebugGeneratorExpressions(libName, llt).c_str()); + this->AppendProperty("LINK_LIBRARIES", + this->GetDebugGeneratorExpressions(libName, llt)); } if (cmGeneratorExpression::Find(lib) != std::string::npos || lib != libRef || @@ -1287,9 +1286,9 @@ void cmTarget::SetProperty(const std::string& prop, const char* value) impl->Properties.SetProperty(prop, reusedFrom.c_str()); - reusedTarget->SetProperty("COMPILE_PDB_NAME", reusedFrom.c_str()); + reusedTarget->SetProperty("COMPILE_PDB_NAME", reusedFrom); reusedTarget->SetProperty("COMPILE_PDB_OUTPUT_DIRECTORY", - cmStrCat(reusedFrom, ".dir/").c_str()); + cmStrCat(reusedFrom, ".dir/")); this->SetProperty("COMPILE_PDB_NAME", reusedTarget->GetProperty("COMPILE_PDB_NAME")); @@ -1424,7 +1423,7 @@ void cmTarget::AppendBuildInterfaceIncludes() dirs += impl->Makefile->GetCurrentSourceDirectory(); if (!dirs.empty()) { this->AppendProperty("INTERFACE_INCLUDE_DIRECTORIES", - ("$<BUILD_INTERFACE:" + dirs + ">").c_str()); + ("$<BUILD_INTERFACE:" + dirs + ">")); } } } |