From d75a6ecbe533fb115d8130122df710790ba9610b Mon Sep 17 00:00:00 2001
From: Nicky <sl.nicky.ml@googlemail.com>
Date: Fri, 22 Apr 2016 12:58:20 +0200
Subject: [PATCH] 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)
---
indra/cmake/00-Common.cmake | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 86fc2dfff5d..84d70bd7b12 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)
--
GitLab