FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved supression of VS warning C4706 from the include/osg/Export header into the CMake options list. Added suppression of C4127 as well.

Browse Source
This commit is contained in:
Robert Osfield
2009-01-08 10:34:05 +00:00
parent fb75c50714
commit 46eeac4514
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -563,8 +563,7 @@ ELSE(CMAKE_COMPILER_IS_GNUCXX)
# FIXME: What are good aggressive warning flags for Visual Studio?
# And do we need to further subcase this for different versions of VS?
# CMake variables: MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005
SET(OSG_AGGRESSIVE_WARNING_FLAGS "/W4")
SET(OSG_AGGRESSIVE_WARNING_FLAGS "/W4 /wd4706 /wd4127")
ELSE(MSVC)
# CMake lacks an elseif, so other non-gcc, non-VS compilers need

4
include/osg/Export
View File

@@ -30,10 +30,6 @@
#pragma warning( disable : 4786 )
#pragma warning( disable : 4305 )
#pragma warning( disable : 4996 )
// suppress warnings about valid if ((variable=expression)) {} usage.
#pragma warning( disable : 4706 )
#endif
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__)