From 1df36678abdeeed3914da6295624f62eacd1c7cc Mon Sep 17 00:00:00 2001 From: Srihari-mcw Date: Mon, 9 Dec 2024 20:40:25 +0530 Subject: [PATCH] Update with .cmake file --- CMakePresets.json | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 58e40bf33..0ec0c0f1d 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -11,18 +11,6 @@ "CMAKE_INSTALL_RPATH": "$ORIGIN;$ORIGIN/.." } }, - { - "name": "clang-ninja", - "hidden": true, - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-${presetName}", - "cacheVariables": { - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", - "CMAKE_C_COMPILER":"clang.exe", - "CMAKE_CXX_COMPILER":"clang++.exe", - "CMAKE_INSTALL_RPATH": "$ORIGIN;$ORIGIN/.." - } - }, { "name": "sycl-base", @@ -44,6 +32,13 @@ { "name": "sycl_f16", "hidden": true, "cacheVariables": { "GGML_SYCL_F16": "ON" } }, { "name": "vulkan", "hidden": true, "cacheVariables": { "GGML_VULKAN": "ON" } }, + { + "name": "x64-windows-llvm", "hidden": true, + "cacheVariables": { + "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/cmake/x64-windows-llvm.cmake" + } + }, + { "name": "arm64-windows-msvc", "hidden": true, "architecture": { "value": "arm64", "strategy": "external" }, @@ -83,15 +78,15 @@ { "name": "arm64-windows-msvc-release", "inherits": [ "base", "arm64-windows-msvc", "reldbg" ] }, { "name": "arm64-windows-msvc+static-release", "inherits": [ "base", "arm64-windows-msvc", "reldbg", "static" ] }, + { "name": "x64-windows-llvm-debug", "inherits": [ "base", "x64-windows-llvm", "debug" ] }, + { "name": "x64-windows-llvm-release", "inherits": [ "base", "x64-windows-llvm", "release" ] }, + { "name": "x64-windows-llvm-reldbg", "inherits": [ "base", "x64-windows-llvm", "reldbg" ] }, + { "name": "x64-windows-llvm+static-release", "inherits": [ "base", "x64-windows-llvm", "reldbg", "static" ] }, + { "name": "x64-windows-msvc-debug", "inherits": [ "base", "debug" ] }, { "name": "x64-windows-msvc-release", "inherits": [ "base", "reldbg" ] }, { "name": "x64-windows-msvc+static-release", "inherits": [ "base", "reldbg", "static" ] }, - { "name": "x64-windows-llvm-debug" , "inherits": [ "clang-ninja", "debug" ] }, - { "name": "x64-windows-llvm-reldbg", "inherits": [ "clang-ninja", "reldbg" ] }, - { "name": "x64-windows-llvm-release", "inherits": [ "clang-ninja", "release" ] }, - { "name": "x64-windows-llvm+static-release", "inherits": [ "clang-ninja", "reldbg", "static" ] }, - { "name": "x64-windows-sycl-debug", "inherits": [ "sycl-base", "debug" ] }, { "name": "x64-windows-sycl-debug-f16", "inherits": [ "sycl-base", "debug", "sycl_f16" ] }, { "name": "x64-windows-sycl-release", "inherits": [ "sycl-base", "release" ] },