Merge "Ignore bool cast warning for MSVC and C++" into release-4-6

diff --git a/cmake/gmxCFlags.cmake b/cmake/gmxCFlags.cmake
index e995e7709fd94e065935f1c851da72db9aaeee17..62fc6f79f4b83ac378e5b64a9d802dfb4b7e7c8b 100644 (file)
--- a/cmake/gmxCFlags.cmake
+++ b/cmake/gmxCFlags.cmake
@@ -178,8 +178,9 @@ MACRO(gmx_c_flags)
     if (MSVC)
         # disable warnings for: 
         #      inconsistent dll linkage
+        #      forcing value to bool (for C++)
         GMX_TEST_CFLAG(CFLAGS_WARN "/wd4273" GMXC_CFLAGS)
-        GMX_TEST_CXXFLAG(CXXFLAGS_WARN "/wd4273" GMXC_CXXFLAGS)
+        GMX_TEST_CXXFLAG(CXXFLAGS_WARN "/wd4273 /wd4800" GMXC_CXXFLAGS)
     endif()
 
     if (CMAKE_C_COMPILER_ID MATCHES "Clang")