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
+25 -14
View File
@@ -6,14 +6,14 @@
"patch": 0
},
"configurePresets": [
{
"name": "default",
"cacheVariables": {
{
"name": "default",
"cacheVariables": {
"__CMAKE_VERBOSE_MAKEFILE": "ON",
"CMAKE_INTERPROCEDURAL_OPTIMIZATION": "ON"
},
"hidden": true
},
},
"hidden": true
},
{
"inherits": "default",
"name": "windows-x64-llvm",
@@ -23,18 +23,16 @@
"toolchainFile": "cmake/toolchains/llvm.cmake",
"generator": "Ninja Multi-Config",
"cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/cmake/toolchains/llvm.cmake"
}
},
{
"inherits": "default",
"name": "windows-x64-msvc",
"name": "windows-x64-msvc2022",
"description": "Windows, x86-64 (MSVC 2022)",
"binaryDir": "build/windows-x64-msvc",
"installDir": "distrib/windows-x64-msvc",
"binaryDir": "build/windows-x64-msvc2022",
"installDir": "distrib/windows-x64-msvc2022",
"generator": "Visual Studio 17 2022",
"cacheVariables": {
}
"cacheVariables": {}
}
],
"buildPresets": [
@@ -45,10 +43,23 @@
"displayName": "Windows, x64 (LLVM)"
},
{
"configurePreset": "windows-x64-msvc",
"name": "windows-x64-msvc",
"configurePreset": "windows-x64-msvc2022",
"name": "windows-x64-msvc2022",
"description": "",
"displayName": "Windows, x64 (MSVC 2022)"
}
],
"workflowPresets": [
{
"name": "windows-x64-llvm",
"description": "",
"displayName": "",
"steps": [
{
"type": "configure",
"name": "windows-x64-llvm"
}
]
}
]
}
LICENSE.adoc
+2 -2
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:
@@ -6,4 +6,4 @@ Redistribution and use in source and binary forms, with or without modification,
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
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.
# 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)
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.
# 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)
list(APPEND CMAKE_MESSAGE_INDENT "[LLVM] ")
@@ -351,7 +351,6 @@ if(
else()
message(FATAL_ERROR "Failed to find or provide a compatible LLVM installation.")
endif()
endif()
list(POP_BACK CMAKE_MESSAGE_INDENT)