mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 22:50:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmLocalGenerator: Use a std::string instead of char*

Browse Source
This commit is contained in:
Stephen Kelly
2016-10-08 12:21:37 +02:00
parent cbca80f351
commit 011e6870e4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmLocalGenerator.cxx
View File

@@ -1431,8 +1431,9 @@ void cmLocalGenerator::OutputLinkLibraries(
std::string fwSearchFlagVar = "CMAKE_";
fwSearchFlagVar += linkLanguage;
fwSearchFlagVar += "_FRAMEWORK_SEARCH_FLAG";
const char* fwSearchFlag = this->Makefile->GetDefinition(fwSearchFlagVar);
if (fwSearchFlag && *fwSearchFlag) {
std::string fwSearchFlag =
this->Makefile->GetSafeDefinition(fwSearchFlagVar);
if (!fwSearchFlag.empty()) {
std::vector<std::string> const& fwDirs = cli.GetFrameworkPaths();
for (std::vector<std::string>::const_iterator fdi = fwDirs.begin();
fdi != fwDirs.end(); ++fdi) {