From 368f4ccabf576f4dc00f16e0c25646f46c2182b7 Mon Sep 17 00:00:00 2001 From: jadebenn Date: Sat, 6 Apr 2024 23:00:04 -0500 Subject: [PATCH] change defaults --- CMakeLists.txt | 2 +- CMakePresets.json | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 56b92316..91459f5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ if(UNIX) elseif(MSVC) # Skip warning for invalid conversion from size_t to uint32_t for all targets below for now # Also disable non-portable MSVC volatile behavior - add_compile_options("/wd4267" "/utf-8" "/volatile:iso") + add_compile_options("/wd4267" "/utf-8" "/volatile:iso" "/Zc:inline") elseif(WIN32) add_compile_definitions(_CRT_SECURE_NO_WARNINGS) endif() diff --git a/CMakePresets.json b/CMakePresets.json index 63f59c7a..d1fd8c5c 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -10,7 +10,7 @@ "name": "default", "displayName": "Default configure step", "description": "Use 'build' dir and Unix makefiles", - "binaryDir": "${sourceDir}/build/default", + "binaryDir": "${sourceDir}/build", "generator": "Unix Makefiles" }, { @@ -50,9 +50,6 @@ "type": "equals", "lhs": "${hostSystemName}", "rhs": "Windows" - }, - "cacheVariables": { - "CMAKE_CXX_FLAGS_INIT": "/Zc:inline" } }, {