diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-19 12:58:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-03-19 12:59:23 (GMT) |
| commit | d2101e944a03056dc2180dd790ba85175e04d653 (patch) | |
| tree | eb878580a4aca74587d4f8ae233491525d94da8d /Source/cmGlobalXCodeGenerator.h | |
| parent | 3c4f92cf5bd38355b4843dd6e882fea012306a10 (diff) | |
| parent | 482d9ef9a8fe640d45eabbf4d6b32cfe5c1d124d (diff) | |
| download | CMake-d2101e944a03056dc2180dd790ba85175e04d653.zip CMake-d2101e944a03056dc2180dd790ba85175e04d653.tar.gz CMake-d2101e944a03056dc2180dd790ba85175e04d653.tar.bz2 | |
Merge topic 'xcodegen-use-std-string'
482d9ef9a8 cmGlobalXCodeGenerator: Prefer std::string over char*
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3111
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.h')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h index 95db852..b80a9ad 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/Source/cmGlobalXCodeGenerator.h @@ -119,8 +119,8 @@ private: const std::string& name); bool CreateGroups(std::vector<cmLocalGenerator*>& generators); std::string XCodeEscapePath(const std::string& p); - std::string RelativeToSource(const char* p); - std::string RelativeToBinary(const char* p); + std::string RelativeToSource(const std::string& p); + std::string RelativeToBinary(const std::string& p); std::string ConvertToRelativeForMake(std::string const& p); void CreateCustomCommands(cmXCodeObject* buildPhases, cmXCodeObject* sourceBuildPhase, |