diff options
| author | Nicky <sl.nicky.ml@googlemail.com> | 2016-04-22 12:58:20 +0200 |
|---|---|---|
| committer | Nicky <sl.nicky.ml@googlemail.com> | 2016-04-22 12:58:20 +0200 |
| commit | d75a6ecbe533fb115d8130122df710790ba9610b (patch) | |
| tree | 9c05ea2ab7ba7c0ca031e2fe9ce70f2cf1533278 /indra/cmake | |
| parent | f611c05355cf0c16829bd83ada57e64d324ed450 (diff) | |
Windows x64: Disable warning 4267 (it causes too much noise) and do not enable /arch:SSE2 (x64 implies SSE2 and setting the flag causes warnings).
(transplanted from 5a7cc3874065b13a83b8c7aa044fb07f38edd283)
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/00-Common.cmake | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 86fc2dfff5..84d70bd7b1 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -74,9 +74,18 @@ if (WINDOWS) /nologo /Oy- /Zc:wchar_t- - /arch:SSE2 +# /arch:SSE2 /fp:fast ) + + # Nicky: x64 implies SSE2 + if( NOT LL_64BIT_BUILD ) + add_definitions( /arch:SSE2 ) + else() + # Otherwise disable 4267 ('var' : conversion from 'size_t' to 'type', possible loss of data) + # This warning alas is all over the place and fixing it will touch a lot of code. + add_definitions("/wd4267 /DLL_64BIT_BUILD" ) + endif() # Are we using the crummy Visual Studio KDU build workaround? if (NOT VS_DISABLE_FATAL_WARNINGS) |