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/cmMakefile.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/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 6c5db75..74cc831 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1939,7 +1939,7 @@ void cmMakefile::AddGlobalLinkInformation(cmTarget& target) target.AddLinkLibrary(*this, libraryName, libType); target.AppendProperty( "INTERFACE_LINK_LIBRARIES", - target.GetDebugGeneratorExpressions(libraryName, libType).c_str()); + target.GetDebugGeneratorExpressions(libraryName, libType)); } } } @@ -2399,7 +2399,7 @@ void cmMakefile::ExpandVariablesCMP0019() << " " << dirs << "\n"; /* clang-format on */ } - t.SetProperty("INCLUDE_DIRECTORIES", dirs.c_str()); + t.SetProperty("INCLUDE_DIRECTORIES", dirs); } } @@ -4550,7 +4550,7 @@ bool cmMakefile::AddRequiredTargetFeature(cmTarget* target, std::string* error) const { if (cmGeneratorExpression::Find(feature) != std::string::npos) { - target->AppendProperty("COMPILE_FEATURES", feature.c_str()); + target->AppendProperty("COMPILE_FEATURES", feature); return true; } @@ -4581,7 +4581,7 @@ bool cmMakefile::AddRequiredTargetFeature(cmTarget* target, return false; } - target->AppendProperty("COMPILE_FEATURES", feature.c_str()); + target->AppendProperty("COMPILE_FEATURES", feature); if (lang == "C" || lang == "OBJC") { return this->AddRequiredTargetCFeature(target, feature, lang, error); |