]> git.lyx.org Git - features.git/commitdiff
cmake: disable warning 4355
authorPeter Kümmel <syntheticpp@gmx.net>
Sun, 2 Dec 2007 12:08:52 +0000 (12:08 +0000)
committerPeter Kümmel <syntheticpp@gmx.net>
Sun, 2 Dec 2007 12:08:52 +0000 (12:08 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21916 a592a061-630c-0410-9148-cb99ea01b6c8

development/cmake/CMakeLists.txt

index bbd10f68401e78b6bd4625f9f9e9150d00f7fb0a..60ce8b8e2723dfd2833e4b2e25b98af895e97d18 100644 (file)
@@ -245,7 +245,7 @@ if(MSVC)
                # add here warnings which should produce an error /weXXXX
                set(MSVC_W_ERROR   "/we4101 /we4189")
                # add here warnings which should be disabled /wdXXXX
-               set(MSVC_W_DISABLE "/wd4800 /wd4996 /wd4311 /wd4312 /wd4505 /wd4267 /wd4512 /wd4245 /wd4127 /wd4180")
+               set(MSVC_W_DISABLE "/wd4355 /wd4800 /wd4996 /wd4311 /wd4312 /wd4505 /wd4267 /wd4512 /wd4245 /wd4127 /wd4180")
                
                set(CMAKE_CXX_FLAGS_DEBUG
                        "${CMAKE_CXX_FLAGS_DEBUG} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
@@ -263,7 +263,7 @@ if(MSVC)
                # add here warnings which should produce an error /weXXXX
                set(MSVC_W_ERROR   "/we4101 /we4189")
                # add here warnings which should be disabled /wdXXXX
-               set(MSVC_W_DISABLE "/wd4800 /wd4996 /wd4267 /wd4180")
+               set(MSVC_W_DISABLE "/wd4355 /wd4800 /wd4996 /wd4267 /wd4180")
                
                set(CMAKE_CXX_FLAGS_DEBUG
                        "${CMAKE_CXX_FLAGS_DEBUG} ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")