diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-09 11:59:48 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-08-09 12:00:03 (GMT) |
| commit | 75844dd6092418ba4353352dfc172d5f5588a553 (patch) | |
| tree | ff62edccfba19c8513170dca39b981f7a8aa6e24 /Source/cmExtraEclipseCDT4Generator.cxx | |
| parent | 34334c098f85004242f109857193f5f8cdce697d (diff) | |
| parent | 69ca85cc7faf937d6d9d1dc1a27e062cd7765b1f (diff) | |
| download | CMake-75844dd6092418ba4353352dfc172d5f5588a553.zip CMake-75844dd6092418ba4353352dfc172d5f5588a553.tar.gz CMake-75844dd6092418ba4353352dfc172d5f5588a553.tar.bz2 | |
Merge topic 'cleanup-find-cstr'
69ca85cc7f Remove unnecessary c_str() in RegularExpression::find calls
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2271
Diffstat (limited to 'Source/cmExtraEclipseCDT4Generator.cxx')
| -rw-r--r-- | Source/cmExtraEclipseCDT4Generator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 0958e99..313d46b 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -98,7 +98,7 @@ void cmExtraEclipseCDT4Generator::Generate() std::string eclipseVersion = mf->GetSafeDefinition("CMAKE_ECLIPSE_VERSION"); cmsys::RegularExpression regex(".*([0-9]+\\.[0-9]+).*"); - if (regex.find(eclipseVersion.c_str())) { + if (regex.find(eclipseVersion)) { unsigned int majorVersion = 0; unsigned int minorVersion = 0; int res = @@ -555,7 +555,7 @@ void cmExtraEclipseCDT4Generator::AppendIncludeDirectories( // Frameworks/ part has to be stripped // /System/Library/Frameworks/GLUT.framework/Headers cmsys::RegularExpression frameworkRx("(.+/Frameworks)/.+\\.framework/"); - if (frameworkRx.find(dir.c_str())) { + if (frameworkRx.find(dir)) { dir = frameworkRx.match(1); } |