diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-02-04 12:26:28 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-04 16:33:17 +0100 |
commit | be8c47b1404257e33d6b7866101167726a3d1c30 (patch) | |
tree | 7a4df72ce2ef43de1f887488e5f9ad45df9cc9b0 /qmake/generators | |
parent | 9c1628aae3d3a7a5f935caa10f838ca24832c5f5 (diff) |
qmake/MSVC: fix parsing of the /openmp option
Task-number: QTBUG-29143
Change-Id: I6b1ce0babf51701fa404b821b22060a87c4f46b2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/generators')
-rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 475f265295..2a9e657304 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -1078,11 +1078,20 @@ bool VCCLCompilerTool::parseOption(const char* option) } found = false; break; case 'o': - if (second == 'p' && third == 'e' && fourth == 'n') { - OpenMP = _True; - break; + { + const char *str = option + 2; + const size_t len = strlen(str); + if (len >= 5 && len <= 6 && strncmp(str, "penmp", 5) == 0) { + if (len == 5) { + OpenMP = _True; + break; + } else if (str[5] == '-') { + OpenMP = _False; + break; + } } found = false; break; + } case 's': if(second == 'h' && third == 'o' && fourth == 'w') { ShowIncludes = _True; |