diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2018-09-04 15:08:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-09-05 19:15:55 (GMT) |
| commit | 4d89830d7117a6fb68346d4ebe5f2f3c6d3223a0 (patch) | |
| tree | d7609df1293e9d4af24cb27e5d9f024844ed6144 /Source/cmLocalVisualStudio7Generator.cxx | |
| parent | 612975c6652c83c29fcfcf56a7b5a0cfe0218c93 (diff) | |
| download | CMake-4d89830d7117a6fb68346d4ebe5f2f3c6d3223a0.zip CMake-4d89830d7117a6fb68346d4ebe5f2f3c6d3223a0.tar.gz CMake-4d89830d7117a6fb68346d4ebe5f2f3c6d3223a0.tar.bz2 | |
cmMakefile: Make GetRequiredDefinition return std::string
In all cases the return value is converted to std::string anyway.
Also remove unnecessary `c_str()` calls in arguments to
`GetRequiredDefinition`.
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 80f2803..13bd214 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -665,11 +665,11 @@ void cmLocalVisualStudio7Generator::WriteConfiguration( std::string baseFlagVar = "CMAKE_"; baseFlagVar += langForClCompile; baseFlagVar += "_FLAGS"; - flags = this->Makefile->GetRequiredDefinition(baseFlagVar.c_str()); + flags = this->Makefile->GetRequiredDefinition(baseFlagVar); std::string flagVar = baseFlagVar + std::string("_") + cmSystemTools::UpperCase(configName); flags += " "; - flags += this->Makefile->GetRequiredDefinition(flagVar.c_str()); + flags += this->Makefile->GetRequiredDefinition(flagVar); } // set the correct language if (linkLanguage == "C") { @@ -931,8 +931,7 @@ std::string cmLocalVisualStudio7Generator::GetBuildTypeLinkerFlags( rootLinkerFlags + "_" + configTypeUpper; std::string extraLinkOptionsBuildType = - this->Makefile->GetRequiredDefinition( - extraLinkOptionsBuildTypeDef.c_str()); + this->Makefile->GetRequiredDefinition(extraLinkOptionsBuildTypeDef); return extraLinkOptionsBuildType; } |