From e57f229c77f76eb63ab2e133c328a052d5a1d9fc Mon Sep 17 00:00:00 2001 From: Xaymar Date: Fri, 18 Apr 2025 16:05:46 +0200 Subject: [PATCH] I broke it again --- .vscode/settings.json | 5 +++++ CMakePresets.json | 39 +++++++++++++++++++++++------------- LICENSE.adoc | 4 ++-- cmake/generators/ninja.cmake | 2 +- cmake/toolchains/llvm.cmake | 3 +-- 5 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..a219711 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "cmake.configureArgs": [ + "-C ${workspaceFolder}/cmake/generators/ninja.cmake" + ] +} diff --git a/CMakePresets.json b/CMakePresets.json index 39ff0c4..569f9a8 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -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" + } + ] + } ] } diff --git a/LICENSE.adoc b/LICENSE.adoc index 1b8bcb6..645e088 100644 --- a/LICENSE.adoc +++ b/LICENSE.adoc @@ -1,4 +1,4 @@ -Copyright 2014-2024 Michael Fabian 'Xaymar' Dirks +Copyright 2014-2025 Michael Fabian 'Xaymar' Dirks 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. \ No newline at end of file +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. diff --git a/cmake/generators/ninja.cmake b/cmake/generators/ninja.cmake index 1fb424b..3ca11c7 100644 --- a/cmake/generators/ninja.cmake +++ b/cmake/generators/ninja.cmake @@ -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] ") diff --git a/cmake/toolchains/llvm.cmake b/cmake/toolchains/llvm.cmake index feff78e..0056146 100644 --- a/cmake/toolchains/llvm.cmake +++ b/cmake/toolchains/llvm.cmake @@ -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)