From a40ec4edd6459e54003d6df3f1b05f2c4241f028 Mon Sep 17 00:00:00 2001 From: elsid Date: Wed, 15 Jun 2022 10:47:49 +0200 Subject: [PATCH] Avoid D9025 warning by not adding /W3 by default using CMP0092 policy See https://gitlab.kitware.com/cmake/cmake/-/issues/18317 Set policies before declaring the project otherwise they might not take effect. Specifically CMP0092 does not have effect added after project. --- CMakeLists.txt | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 99eab68118..10edfb0f97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,25 +1,32 @@ -project(OpenMW) cmake_minimum_required(VERSION 3.1.0) -set(CMAKE_CXX_STANDARD 20) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -include(GNUInstallDirs) # for link time optimization, remove if cmake version is >= 3.9 if(POLICY CMP0069) # LTO - cmake_policy(SET CMP0069 NEW) + cmake_policy(SET CMP0069 NEW) endif() # for position-independent executable, remove if cmake version is >= 3.14 if(POLICY CMP0083) - cmake_policy(SET CMP0083 NEW) + cmake_policy(SET CMP0083 NEW) endif() # to link with freetype library if(POLICY CMP0079) - cmake_policy(SET CMP0079 NEW) + cmake_policy(SET CMP0079 NEW) endif() +# don't add /W3 flag by default for MSVC +if(POLICY CMP0092) + cmake_policy(SET CMP0092 NEW) +endif() + +project(OpenMW) + +set(CMAKE_CXX_STANDARD 20) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +include(GNUInstallDirs) + option(OPENMW_GL4ES_MANUAL_INIT "Manually initialize gl4es. This is more reliable on platforms without a windowing system. Requires gl4es to be configured with -DNOEGL=ON -DNO_LOADER=ON -DNO_INIT_CONSTRUCTOR=ON." OFF) if(OPENMW_GL4ES_MANUAL_INIT) add_definitions(-DOPENMW_GL4ES_MANUAL_INIT)