From 637c76f438774eb691b1980ad1636f1918e889f5 Mon Sep 17 00:00:00 2001 From: Mads Buvik Sandvei Date: Sat, 19 Dec 2020 08:34:36 +0000 Subject: [PATCH] Update CMakeLists.txt --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f0f7a3fc5..be7bc79e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -557,7 +557,6 @@ if (WIN32) # 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 - 4866 # compiler may not enforce left-to-right evaluation order for call # OpenMW specific warnings 4099 # Type mismatch, declared class or struct is defined with other type @@ -585,6 +584,12 @@ if (WIN32) 5031 # #pragma warning(pop): likely mismatch, popping warning state pushed in different file (config_begin.hpp, config_end.hpp) ) endif() + + if( "${MyGUI_VERSION}" VERSION_LESS_EQUAL "3.4.0" ) + set(WARNINGS_DISABLE ${WARNINGS_DISABLE} + 4866 # compiler may not enforce left-to-right evaluation order for call + ) + endif() foreach(d ${WARNINGS_DISABLE}) set(WARNINGS "${WARNINGS} /wd${d}")