xaymar/BlitzLLVM
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

I broke it again

Browse Source
This commit is contained in:
Xaymar
2025-04-18 16:05:46 +02:00
parent cd78d7a42d
commit e57f229c77
5 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vscode/settings.json
Vendored
+5
View File
@@ -0,0 +1,5 @@
{
"cmake.configureArgs": [
"-C ${workspaceFolder}/cmake/generators/ninja.cmake"
]
}
CMakePresets.json
+19 -8
View File
@@ -23,18 +23,16 @@
"toolchainFile": "cmake/toolchains/llvm.cmake", "toolchainFile": "cmake/toolchains/llvm.cmake",
"generator": "Ninja Multi-Config", "generator": "Ninja Multi-Config",
"cacheVariables": { "cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/cmake/toolchains/llvm.cmake"
} }
}, },
{ {
"inherits": "default", "inherits": "default",
"name": "windows-x64-msvc", "name": "windows-x64-msvc2022",
"description": "Windows, x86-64 (MSVC 2022)", "description": "Windows, x86-64 (MSVC 2022)",
"binaryDir": "build/windows-x64-msvc", "binaryDir": "build/windows-x64-msvc2022",
"installDir": "distrib/windows-x64-msvc", "installDir": "distrib/windows-x64-msvc2022",
"generator": "Visual Studio 17 2022", "generator": "Visual Studio 17 2022",
"cacheVariables": { "cacheVariables": {}
}
} }
], ],
"buildPresets": [ "buildPresets": [
@@ -45,10 +43,23 @@
"displayName": "Windows, x64 (LLVM)" "displayName": "Windows, x64 (LLVM)"
}, },
{ {
"configurePreset": "windows-x64-msvc", "configurePreset": "windows-x64-msvc2022",
"name": "windows-x64-msvc", "name": "windows-x64-msvc2022",
"description": "", "description": "",
"displayName": "Windows, x64 (MSVC 2022)" "displayName": "Windows, x64 (MSVC 2022)"
} }
],
"workflowPresets": [
{
"name": "windows-x64-llvm",
"description": "",
"displayName": "",
"steps": [
{
"type": "configure",
"name": "windows-x64-llvm"
}
]
}
] ]
} }
LICENSE.adoc
+1 -1
View File
@@ -1,4 +1,4 @@
Copyright 2014-2024 Michael Fabian 'Xaymar' Dirks <info@xaymar.com> Copyright 2014-2025 Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
cmake/generators/ninja.cmake
+1 -1
View File
@@ -16,7 +16,7 @@
# This is a script file that installs the necessary "Ninja" and "Ninja Multi-Config" generators. # This is a script file that installs the necessary "Ninja" and "Ninja Multi-Config" generators.
# Run with `cmake -P cmake/generators/ninja.cmake` from the source directory. # Run with `cmake -P cmake/generators/ninja.cmake` from the source directory.
cmake_minimum_required(VERSION 3.30...4.0) cmake_minimum_required(VERSION 4.0 FATAL_ERROR)
include_guard(GLOBAL) include_guard(GLOBAL)
list(APPEND CMAKE_MESSAGE_INDENT "[Ninja] ") list(APPEND CMAKE_MESSAGE_INDENT "[Ninja] ")
cmake/toolchains/llvm.cmake
+1 -2
View File
@@ -16,7 +16,7 @@
# This is a (mostly) self-contained toolchain file that sets up everything necessary to compile with LLVM/Clang. # This is a (mostly) self-contained toolchain file that sets up everything necessary to compile with LLVM/Clang.
# cmake --fresh -C cmake/generators/ninja.cmake --preset windows-x64-llvm # cmake --fresh -C cmake/generators/ninja.cmake --preset windows-x64-llvm
cmake_minimum_required(VERSION 3.30...4.0) cmake_minimum_required(VERSION 4.0 FATAL_ERROR)
include_guard(GLOBAL) include_guard(GLOBAL)
list(APPEND CMAKE_MESSAGE_INDENT "[LLVM] ") list(APPEND CMAKE_MESSAGE_INDENT "[LLVM] ")
@@ -351,7 +351,6 @@ if(
else() else()
message(FATAL_ERROR "Failed to find or provide a compatible LLVM installation.") message(FATAL_ERROR "Failed to find or provide a compatible LLVM installation.")
endif() endif()
endif() endif()
list(POP_BACK CMAKE_MESSAGE_INDENT) list(POP_BACK CMAKE_MESSAGE_INDENT)