From ae2115c68d18b2b12bf4435764248a2bba2f7d68 Mon Sep 17 00:00:00 2001 From: jadebenn Date: Tue, 30 Jan 2024 20:52:33 -0600 Subject: [PATCH] final(?) try for now --- CMakeLists.txt | 2 +- CMakePresets.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b6a775e..ae3dada6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,7 @@ if(UNIX) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -O2 -fPIC") elseif(MSVC) # Skip warning for invalid conversion from size_t to uint32_t for all targets below for now - add_compile_options("/wd4267" "/utf-8") + add_compile_options ("/permissive-;/Zc:inline;/wd4267;/utf-8") elseif(WIN32) add_compile_definitions(_CRT_SECURE_NO_WARNINGS) endif() diff --git a/CMakePresets.json b/CMakePresets.json index c8c69ec3..a0a7cb8d 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -35,8 +35,7 @@ "value": "x64" }, "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "COMPILE_OPTIONS": "/W3;/WX;/permissive-;/Zc:inline" + "CMAKE_BUILD_TYPE": "RelWithDebInfo" } }, {