diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-23 13:15:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-23 13:16:15 (GMT) |
| commit | e898f48bbc944c5525f7f292b55cca8ae2fa4cae (patch) | |
| tree | 1eab1f09f2da7bb15a8caef4a087957be8d06311 /Source/cmLocalGenerator.cxx | |
| parent | c1247d861a42fa79e7ca4cc9a793b1fa1f012dce (diff) | |
| parent | 2993fc347af5db802721f1bbe0a0e05d19a28e89 (diff) | |
| download | CMake-e898f48bbc944c5525f7f292b55cca8ae2fa4cae.zip CMake-e898f48bbc944c5525f7f292b55cca8ae2fa4cae.tar.gz CMake-e898f48bbc944c5525f7f292b55cca8ae2fa4cae.tar.bz2 | |
Merge topic 'getmodulesfile-string'
2993fc347a cmMakefile: GetModulesFile() accepts std::string param
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2838
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 23afbd0..3771737 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2791,7 +2791,7 @@ void cmLocalGenerator::GenerateAppleInfoPList(cmGeneratorTarget* target, const char* in = target->GetProperty("MACOSX_BUNDLE_INFO_PLIST"); std::string inFile = (in && *in) ? in : "MacOSXBundleInfo.plist.in"; if (!cmSystemTools::FileIsFullPath(inFile)) { - std::string inMod = this->Makefile->GetModulesFile(inFile.c_str()); + std::string inMod = this->Makefile->GetModulesFile(inFile); if (!inMod.empty()) { inFile = inMod; } @@ -2829,7 +2829,7 @@ void cmLocalGenerator::GenerateFrameworkInfoPList( const char* in = target->GetProperty("MACOSX_FRAMEWORK_INFO_PLIST"); std::string inFile = (in && *in) ? in : "MacOSXFrameworkInfo.plist.in"; if (!cmSystemTools::FileIsFullPath(inFile)) { - std::string inMod = this->Makefile->GetModulesFile(inFile.c_str()); + std::string inMod = this->Makefile->GetModulesFile(inFile); if (!inMod.empty()) { inFile = inMod; } |