From 1b1c786d0cf89d6c9d829afaa7ce4676cf36a064 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Mon, 19 Apr 2021 15:34:22 +0400 Subject: [PATCH] Do not suppress fixed MyGUI warnings --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index efc405a45f..dd063d4a92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -608,7 +608,6 @@ if (WIN32) 5204 # Class has virtual functions, but its trivial destructor is not virtual # caused by MyGUI - 4275 # non dll-interface class 'std::exception' used as base for dll-interface class 'MyGUI::Exception' 4297 # function assumed not to throw an exception but does # OpenMW specific warnings @@ -644,6 +643,12 @@ if (WIN32) ) endif() + if( "${MyGUI_VERSION}" VERSION_LESS_EQUAL "3.4.1" ) + set(WARNINGS_DISABLE ${WARNINGS_DISABLE} + 4275 # non dll-interface class 'MyGUI::delegates::IDelegateUnlink' used as base for dll-interface class 'MyGUI::Widget' + ) + endif() + foreach(d ${WARNINGS_DISABLE}) set(WARNINGS "${WARNINGS} /wd${d}") endforeach(d)