diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2014-01-17 18:38:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-08 18:05:28 (GMT) |
| commit | 381d50c149183183378b446fd789b1bd18c7524c (patch) | |
| tree | 41f13826232b6b3650df64ef564a9a18d2a21479 /Source/cmQtAutoGenerators.cxx | |
| parent | 3742bb0d324b971f63cc7e557b1cb8a9d08c5cdd (diff) | |
| download | CMake-381d50c149183183378b446fd789b1bd18c7524c.zip CMake-381d50c149183183378b446fd789b1bd18c7524c.tar.gz CMake-381d50c149183183378b446fd789b1bd18c7524c.tar.bz2 | |
stringapi: Accept strings in cmStrCmp
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 7d0ce5f..d940fe2 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -660,7 +660,7 @@ void cmQtAutoGenerators::MergeUicOptions(std::vector<std::string> &opts, ++o; } if (std::find_if(cmArrayBegin(valueOptions), cmArrayEnd(valueOptions), - cmStrCmp(o)) != cmArrayEnd(valueOptions)) + cmStrCmp(*it)) != cmArrayEnd(valueOptions)) { assert(existingIt + 1 != opts.end()); *(existingIt + 1) = *(it + 1); @@ -831,7 +831,7 @@ void cmQtAutoGenerators::MergeRccOptions(std::vector<std::string> &opts, ++o; } if (std::find_if(cmArrayBegin(valueOptions), cmArrayEnd(valueOptions), - cmStrCmp(o)) != cmArrayEnd(valueOptions)) + cmStrCmp(*it)) != cmArrayEnd(valueOptions)) { assert(existingIt + 1 != opts.end()); *(existingIt + 1) = *(it + 1); |