diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-25 12:59:51 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-25 12:59:59 (GMT) |
| commit | 0476d16589cf62bc631acc2f50ff2a0525b6d641 (patch) | |
| tree | 217b45e0071c8f00983eebf5f9df52646dd571c8 /Source/cmLocalGenerator.cxx | |
| parent | ae309d757dfb4f654360f5412b86243e54cc387a (diff) | |
| parent | 4e315e9449735fc0f246c8cc838613693e849296 (diff) | |
| download | CMake-0476d16589cf62bc631acc2f50ff2a0525b6d641.zip CMake-0476d16589cf62bc631acc2f50ff2a0525b6d641.tar.gz CMake-0476d16589cf62bc631acc2f50ff2a0525b6d641.tar.bz2 | |
Merge topic 'systools-stdstring3'
4e315e9449 cmSystemTools: More functions accept `std::string` params
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2999
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 7241dde..9c5c974 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -776,7 +776,7 @@ std::string cmLocalGenerator::GetIncludeFlags( #endif for (std::string const& i : includes) { if (fwSearchFlag && *fwSearchFlag && this->Makefile->IsOn("APPLE") && - cmSystemTools::IsPathToFramework(i.c_str())) { + cmSystemTools::IsPathToFramework(i)) { std::string frameworkDir = i; frameworkDir += "/../"; frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir); |