diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-08 10:21:37 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-10-10 18:38:56 (GMT) |
| commit | 011e6870e4a7f19476c162a8c011fd018d9a7e9c (patch) | |
| tree | 2af433ebc9f9ffa14a059770800ed3afbd48e725 /Source/cmLocalGenerator.cxx | |
| parent | cbca80f3516d7e5b2def6105a1b26b44bad7b6fe (diff) | |
| download | CMake-011e6870e4a7f19476c162a8c011fd018d9a7e9c.zip CMake-011e6870e4a7f19476c162a8c011fd018d9a7e9c.tar.gz CMake-011e6870e4a7f19476c162a8c011fd018d9a7e9c.tar.bz2 | |
cmLocalGenerator: Use a std::string instead of char*
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 565c0cd..3b3eea3 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -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) { |