diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-06-19 15:52:49 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-13 05:11:25 +0100 |
| commit | ce1c53b4130495b17addc45bf3f5b2a2dc052507 (patch) | |
| tree | 7d964a0391a022fe99a0ee87b5547de8359f3aa7 /mkspecs/common/msvc-desktop.conf | |
| parent | c23d1c76953704ecb52c833d7ef1de2e2f89b1e6 (diff) | |
Add detection of and support for Visual Studio 2015
Tested with the Preview release of November 2014.
Differences to the 2013 detection and support:
- Option -Zc:strictStrings is present in both debug and release mode
and is passed to qmake's own build
- New warnings 4456, 4457 and 4458 (shadowing) are disabled
- Compiler supports -arch:AVX2
Change-Id: I9572ff4d4aded4004c1fa5d6f13ffee5462043d6
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'mkspecs/common/msvc-desktop.conf')
| -rw-r--r-- | mkspecs/common/msvc-desktop.conf | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf index 044d21e426..bae8c7f267 100644 --- a/mkspecs/common/msvc-desktop.conf +++ b/mkspecs/common/msvc-desktop.conf @@ -123,10 +123,22 @@ greaterThan(MSC_VER, 1799) { # Visual Studio 2013 (12.0) / Visual C++ 18.0 and up QMAKE_CFLAGS += -FS QMAKE_CXXFLAGS += -FS - QMAKE_CFLAGS_RELEASE += -Zc:strictStrings - QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -Zc:strictStrings - QMAKE_CXXFLAGS_RELEASE += -Zc:strictStrings - QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -Zc:strictStrings + + equals(MSC_VER, 1800) { + QMAKE_CFLAGS_RELEASE += -Zc:strictStrings + QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -Zc:strictStrings + QMAKE_CXXFLAGS_RELEASE += -Zc:strictStrings + QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -Zc:strictStrings + } +} + +greaterThan(MSC_VER, 1899) { + # Visual Studio 2015 (14.0) / Visual C++ 19.0 and up + QMAKE_CFLAGS += -Zc:strictStrings + QMAKE_CFLAGS_WARN_ON += -w44456 -w44457 -w44458 + QMAKE_CFLAGS_AVX2 = -arch:AVX2 + QMAKE_CXXFLAGS += -Zc:strictStrings + QMAKE_CXXFLAGS_WARN_ON += -w44456 -w44457 -w44458 } unset(MSC_VER) |