Merge pull request #693 from hujiajie/master
[WIP] Suppress compiler warnings.
This commit is contained in:
@@ -87,6 +87,8 @@ IF(MSVC)
|
|||||||
IF (USE_MSVC_FAST_FLOATINGPOINT)
|
IF (USE_MSVC_FAST_FLOATINGPOINT)
|
||||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast")
|
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
|
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267")
|
||||||
ENDIF(MSVC)
|
ENDIF(MSVC)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -6,10 +6,15 @@
|
|||||||
osversion.majorversion, osversion.minorversion, osversion.revision,
|
osversion.majorversion, osversion.minorversion, osversion.revision,
|
||||||
osversion.description))
|
osversion.description))
|
||||||
|
|
||||||
|
|
||||||
-- Multithreaded compiling
|
|
||||||
if _ACTION == "vs2010" or _ACTION=="vs2008" then
|
if _ACTION == "vs2010" or _ACTION=="vs2008" then
|
||||||
buildoptions { "/MP" }
|
buildoptions
|
||||||
|
{
|
||||||
|
-- Multithreaded compiling
|
||||||
|
"/MP",
|
||||||
|
-- Disable a few useless warnings
|
||||||
|
"/wd4244",
|
||||||
|
"/wd4267"
|
||||||
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
act = ""
|
act = ""
|
||||||
|
|||||||
Reference in New Issue
Block a user