Merge pull request #693 from hujiajie/master

[WIP] Suppress compiler warnings.
This commit is contained in:
erwincoumans
2016-07-14 10:52:59 -07:00
committed by GitHub
2 changed files with 10 additions and 3 deletions

View File

@@ -87,6 +87,8 @@ IF(MSVC)
IF (USE_MSVC_FAST_FLOATINGPOINT)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast")
ENDIF()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267")
ENDIF(MSVC)

View File

@@ -6,10 +6,15 @@
osversion.majorversion, osversion.minorversion, osversion.revision,
osversion.description))
-- Multithreaded compiling
if _ACTION == "vs2010" or _ACTION=="vs2008" then
buildoptions { "/MP" }
buildoptions
{
-- Multithreaded compiling
"/MP",
-- Disable a few useless warnings
"/wd4244",
"/wd4267"
}
end
act = ""