From 73a837962dc3d03b14b09beb4e9708508dbfc1f1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 12 Apr 2024 00:43:41 +0200 Subject: [PATCH] =?UTF-8?q?Adapt=20the=20`arch-=E2=80=A6-w64-mingw32-stati?= =?UTF-8?q?c`=20presets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not sure what has changed but it seems that these extra variables are now required to avoid linking against certain shared libraries. --- CMakePresets.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index ca86f81..e9f3325 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -218,7 +218,10 @@ "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-i686-w64-mingw32-static", "toolchainFile": "/usr/share/mingw/toolchain-i686-w64-mingw32-static.cmake", "cacheVariables": { - "BUILD_SHARED_LIBS": {"type": "BOOL", "value": "OFF"} + "BUILD_SHARED_LIBS": {"type": "BOOL", "value": "OFF"}, + "CMAKE_FIND_LIBRARY_SUFFIXES": {"type": "STRING", "value": ".a;.lib"}, + "STATIC_LIBRARY_LINKAGE": {"type": "BOOL", "value": "ON"}, + "STATIC_LINKAGE": {"type": "BOOL", "value": "ON"} } }, { @@ -229,7 +232,10 @@ "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-x86_64-w64-mingw32-static", "toolchainFile": "/usr/share/mingw/toolchain-x86_64-w64-mingw32-static.cmake", "cacheVariables": { - "BUILD_SHARED_LIBS": {"type": "BOOL", "value": "OFF"} + "BUILD_SHARED_LIBS": {"type": "BOOL", "value": "OFF"}, + "CMAKE_FIND_LIBRARY_SUFFIXES": {"type": "STRING", "value": ".a;.lib"}, + "STATIC_LIBRARY_LINKAGE": {"type": "BOOL", "value": "ON"}, + "STATIC_LINKAGE": {"type": "BOOL", "value": "ON"} } }, {