From d0ee9f494d18e9809893df85cdf87e5becc7b5a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Sun, 2 Dec 2007 12:08:52 +0000 Subject: [PATCH] cmake: disable warning 4355 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21916 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index bbd10f6840..60ce8b8e27 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -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}")