From 5425488421e6b27d81bdd010dcd0bc2655f7dc63 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 1 May 2023 19:25:18 +0200 Subject: [PATCH] Fix preset for debug build with MSVC * The preset must inherit from "debug" first so the build type is not overridden * Use the debug library of cppunit * Avoid configuring ccache which is not generally used under Windows --- CMakePresets.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index ab3e709..a750981 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -238,10 +238,15 @@ }, { "name": "win-x64-msvc-static-debug", - "inherits": ["win-x64-msvc-static-devel", "debug"], + "inherits": ["debug", "win-x64-msvc-static-devel"], "displayName": "Combination of debug and win-x64-msvc-static", "description": "See descriptions of debug and win-x64-msvc-static", - "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/win-x64-msvc-static-debug" + "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/win-x64-msvc-static-debug", + "cacheVariables": { + "CMAKE_C_COMPILER_LAUNCHER": {"type": "STRING", "value": ""}, + "CMAKE_CXX_COMPILER_LAUNCHER": {"type": "STRING", "value": ""}, + "CPP_UNIT_LIB": {"type": "FILEPATH", "value": "$env{VCPKG_ROOT}/installed/x64-windows-static/debug/lib/cppunitd.lib"} + } } ], "buildPresets": [