Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[llgi] Disable warnings as errors. (#51778)

This commit is contained in:
Billy O'Neal 2026-05-15 01:41:22 -07:00 committed by GitHub
parent 758bb068e8
commit 1dd6d8504f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 179 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/glslang/usage
View File

@ -1,4 +1,4 @@
glslang provides CMake targets:
find_package(glslang CONFIG REQUIRED)
target_link_libraries(main PRIVATE glslang::glslang glslang::glslang-default-resource-limits glslang::SPIRV glslang::SPVRemapper)
glslang provides CMake targets:
find_package(glslang CONFIG REQUIRED)
target_link_libraries(main PRIVATE glslang::glslang glslang::glslang-default-resource-limits glslang::SPIRV)

1
ports/glslang/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "glslang",
"version": "16.3.0",
"port-version": 1,
"description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.",
"homepage": "https://github.com/KhronosGroup/glslang",
"license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later",

89
ports/llgi/fix-cmake-use-vcpkg.patch
View File

@ -1,46 +1,43 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5fd2ce0..202bcfe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,10 +27,6 @@ option(SPIRVCROSS_WITHOUT_INSTALL "Compile with spirv-cross without install"
OFF)
option(USE_CREATE_COMPILER_FUNCTION "Whether LLGI::CreateCompiler is used." ON)
-if(LINUX)
- set(BUILD_VULKAN TRUE)
-endif()
-
option(USE_MSVC_RUNTIME_LIBRARY_DLL "compile as multithreaded DLL" ON)
include(cmake/ClangFormat.cmake)
@@ -234,8 +230,13 @@ if(BUILD_VULKAN_COMPILER OR BUILD_TOOL)
spirv-cross-util)
else()
- list(APPEND LLGI_THIRDPARTY_INCLUDES ${GLSLANG_INCLUDE_DIR}
- ${SPIRVCROSS_INCLUDE_DIR})
+ # from vcpkg
+ find_package(glslang CONFIG REQUIRED)
+ find_package(spirv_cross_core CONFIG REQUIRED)
+ find_package(spirv_cross_glsl CONFIG REQUIRED)
+ find_package(spirv_cross_hlsl CONFIG REQUIRED)
+ find_package(spirv_cross_msl CONFIG REQUIRED)
+ find_package(spirv_cross_cpp CONFIG REQUIRED)
endif()
diff --git a/tools/ShaderTranspilerCore/CMakeLists.txt b/tools/ShaderTranspilerCore/CMakeLists.txt
index bf34437..09e428d 100644
--- a/tools/ShaderTranspilerCore/CMakeLists.txt
+++ b/tools/ShaderTranspilerCore/CMakeLists.txt
@@ -24,6 +24,10 @@ else()
endif()
+target_link_libraries(ShaderTranspilerCore PUBLIC
+ glslang::glslang glslang::glslang-default-resource-limits glslang::SPIRV glslang::SPVRemapper spirv-cross-cpp spirv-cross-glsl spirv-cross-msl spirv-cross-hlsl
+)
+
if(USE_THIRDPARTY_DIRECTORY)
add_dependencies(ShaderTranspilerCore EP_glslang EP_SPIRV-Cross)
endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5fd2ce0..e05f57c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,9 +27,6 @@ option(SPIRVCROSS_WITHOUT_INSTALL "Compile with spirv-cross without install"
OFF)
option(USE_CREATE_COMPILER_FUNCTION "Whether LLGI::CreateCompiler is used." ON)
-if(LINUX)
- set(BUILD_VULKAN TRUE)
-endif()
option(USE_MSVC_RUNTIME_LIBRARY_DLL "compile as multithreaded DLL" ON)
@@ -234,8 +231,12 @@ if(BUILD_VULKAN_COMPILER OR BUILD_TOOL)
spirv-cross-util)
else()
- list(APPEND LLGI_THIRDPARTY_INCLUDES ${GLSLANG_INCLUDE_DIR}
- ${SPIRVCROSS_INCLUDE_DIR})
+ find_package(glslang CONFIG REQUIRED)
+ find_package(spirv_cross_core CONFIG REQUIRED)
+ find_package(spirv_cross_glsl CONFIG REQUIRED)
+ find_package(spirv_cross_hlsl CONFIG REQUIRED)
+ find_package(spirv_cross_msl CONFIG REQUIRED)
+ find_package(spirv_cross_cpp CONFIG REQUIRED)
endif()
diff --git a/tools/ShaderTranspilerCore/CMakeLists.txt b/tools/ShaderTranspilerCore/CMakeLists.txt
index bf34437..1c565fc 100644
--- a/tools/ShaderTranspilerCore/CMakeLists.txt
+++ b/tools/ShaderTranspilerCore/CMakeLists.txt
@@ -23,6 +23,9 @@ else()
pthread)
endif()
+target_link_libraries(ShaderTranspilerCore PUBLIC
+ glslang::glslang glslang::glslang-default-resource-limits glslang::SPIRV spirv-cross-cpp spirv-cross-glsl spirv-cross-msl spirv-cross-hlsl
+)
if(USE_THIRDPARTY_DIRECTORY)
add_dependencies(ShaderTranspilerCore EP_glslang EP_SPIRV-Cross)

11
ports/llgi/fix-sources.patch → ports/llgi/fix-missing-headers.diff
View File

@ -1,14 +1,13 @@
diff --git a/tools/ShaderTranspilerCore/ShaderTranspilerCore.h b/tools/ShaderTranspilerCore/ShaderTranspilerCore.h
index 269afa6..1d1015f 100644
index 3ef5d67..674bbce 100644
--- a/tools/ShaderTranspilerCore/ShaderTranspilerCore.h
+++ b/tools/ShaderTranspilerCore/ShaderTranspilerCore.h
@@ -1,7 +1,7 @@
@@ -2,6 +2,8 @@
#pragma once
-
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
#include <stdint.h>
+#include <stddef.h>
#include "../../src/LLGI.Base.h"
#include <memory>

105
ports/llgi/portfile.cmake
View File

@ -1,52 +1,53 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO altseed/LLGI
REF 8f8510e2dffa1d747ff6ebb0da341198e75291ec
SHA512 d521b47f293b90faed28f9648facdfae327c6122ea6391683a08e48558fdf62ce0d3977f78aef3bc276d77ab19fc40ab3cc4d27311dd5a292e0884635fe7c9d3
HEAD_REF master
PATCHES
fix-cmake-use-vcpkg.patch
fix-sources.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
vulkan BUILD_VULKAN
vulkan BUILD_VULKAN_COMPILER
tool BUILD_TOOL
)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" USE_DYNAMIC_RUNTIME)
# linux build requires x11-xcb
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-DBUILD_TEST=OFF
-DBUILD_EXAMPLE=OFF
-DUSE_CREATE_COMPILER_FUNCTION=ON
-DUSE_THIRDPARTY_DIRECTORY=OFF # prevent ExternalProject_Add
-DUSE_MSVC_RUNTIME_LIBRARY_DLL:BOOL=${USE_DYNAMIC_RUNTIME}
-DGLSLANG_WITHOUT_INSTALL=OFF
-DSPIRVCROSS_WITHOUT_INSTALL=OFF
MAYBE_UNUSED_VARIABLES
USE_MSVC_RUNTIME_LIBRARY_DLL
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake")
if("tool" IN_LIST FEATURES)
vcpkg_copy_tools(TOOL_NAMES ShaderTranspiler AUTO_CLEAN)
endif()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/debug/bin"
"${CURRENT_PACKAGES_DIR}/bin"
)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO altseed/LLGI
REF 8f8510e2dffa1d747ff6ebb0da341198e75291ec
SHA512 d521b47f293b90faed28f9648facdfae327c6122ea6391683a08e48558fdf62ce0d3977f78aef3bc276d77ab19fc40ab3cc4d27311dd5a292e0884635fe7c9d3
HEAD_REF master
PATCHES
fix-cmake-use-vcpkg.patch
fix-missing-headers.diff
remove-warnings-as-errors.diff
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
vulkan BUILD_VULKAN
vulkan BUILD_VULKAN_COMPILER
tool BUILD_TOOL
)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" USE_DYNAMIC_RUNTIME)
# linux build requires x11-xcb
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-DBUILD_TEST=OFF
-DBUILD_EXAMPLE=OFF
-DUSE_CREATE_COMPILER_FUNCTION=ON
-DUSE_THIRDPARTY_DIRECTORY=OFF # prevent ExternalProject_Add
-DUSE_MSVC_RUNTIME_LIBRARY_DLL:BOOL=${USE_DYNAMIC_RUNTIME}
-DGLSLANG_WITHOUT_INSTALL=OFF
-DSPIRVCROSS_WITHOUT_INSTALL=OFF
MAYBE_UNUSED_VARIABLES
USE_MSVC_RUNTIME_LIBRARY_DLL
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake")
if("tool" IN_LIST FEATURES)
vcpkg_copy_tools(TOOL_NAMES ShaderTranspiler AUTO_CLEAN)
endif()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/debug/bin"
"${CURRENT_PACKAGES_DIR}/bin"
)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

60
ports/llgi/remove-warnings-as-errors.diff Normal file
View File

@ -0,0 +1,60 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4f2ff23..1672568 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -93,9 +93,9 @@ else()
endif()
if(MSVC)
- target_compile_options(LLGI PRIVATE /W4 /WX /wd4100)
+ target_compile_options(LLGI PRIVATE /W4)
else()
- target_compile_options(LLGI PRIVATE -Wall -Werror)
+ target_compile_options(LLGI PRIVATE -Wall)
endif()
# --------------------
diff --git a/src_test/CMakeLists.txt b/src_test/CMakeLists.txt
index a256422..d353b49 100644
--- a/src_test/CMakeLists.txt
+++ b/src_test/CMakeLists.txt
@@ -45,7 +45,7 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/Shaders
clang_format(LLGI_Test)
if(MSVC)
- target_compile_options(LLGI_Test PRIVATE /W4 /WX /wd4100)
+ target_compile_options(LLGI_Test PRIVATE /W4)
else()
- target_compile_options(LLGI_Test PRIVATE -Wall -Werror)
+ target_compile_options(LLGI_Test PRIVATE -Wall)
endif()
diff --git a/tools/ShaderTranspiler/CMakeLists.txt b/tools/ShaderTranspiler/CMakeLists.txt
index 4252485..f42f0a4 100644
--- a/tools/ShaderTranspiler/CMakeLists.txt
+++ b/tools/ShaderTranspiler/CMakeLists.txt
@@ -10,7 +10,7 @@ target_include_directories(ShaderTranspiler PUBLIC ../ShaderTranspilerCore)
target_link_libraries(ShaderTranspiler PUBLIC ShaderTranspilerCore)
if(MSVC)
- target_compile_options(ShaderTranspiler PRIVATE /W4 /WX /wd4100)
+ target_compile_options(ShaderTranspiler PRIVATE /W4)
else()
- target_compile_options(ShaderTranspiler PRIVATE -Wall -Werror)
+ target_compile_options(ShaderTranspiler PRIVATE -Wall)
endif()
diff --git a/tools/ShaderTranspilerCore/CMakeLists.txt b/tools/ShaderTranspilerCore/CMakeLists.txt
index 1c565fc..c8b0ee7 100644
--- a/tools/ShaderTranspilerCore/CMakeLists.txt
+++ b/tools/ShaderTranspilerCore/CMakeLists.txt
@@ -32,9 +32,9 @@ if(USE_THIRDPARTY_DIRECTORY)
endif()
if(MSVC)
- target_compile_options(ShaderTranspilerCore PRIVATE /W4 /WX /wd4100)
+ target_compile_options(ShaderTranspilerCore PRIVATE /W4)
else()
- target_compile_options(ShaderTranspilerCore PRIVATE -Wall -Werror)
+ target_compile_options(ShaderTranspilerCore PRIVATE -Wall)
endif()
if(GLSLANG_WITHOUT_INSTALL)

2
ports/llgi/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "llgi",
"version-date": "2023-12-19",
"port-version": 1,
"port-version": 2,
"homepage": "https://github.com/altseed/LLGI",
"license": null,
"supports": "!(uwp | android)",

2
scripts/ci.feature.baseline.txt
View File

@ -707,8 +707,6 @@ libxt:x64-windows-release=fail # Appears to have broken races
libxt:x64-windows=fail
liquid-dsp:arm64-linux=fail
llama-cpp[tools](arm & windows)=feature-fails # unresolved symbols
llgi[tool]:arm64-linux=feature-fails
llgi[vulkan]:arm64-linux=feature-fails
llgl:arm-neon-android=fail
llgl:arm64-android=fail
llgl:x64-android=fail

4
versions/baseline.json
View File

@ -3486,7 +3486,7 @@
},
"glslang": {
"baseline": "16.3.0",
"port-version": 0
"port-version": 1
},
"glui": {
"baseline": "2019-11-30",
@ -6118,7 +6118,7 @@
},
"llgi": {
"baseline": "2023-12-19",
"port-version": 1
"port-version": 2
},
"llgl": {
"baseline": "2023-03-05",

5
versions/g-/glslang.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3e9410445ffd44e935719f4d6f84e772157cc02f",
"version": "16.3.0",
"port-version": 1
},
{
"git-tree": "e55db9b88f5b0fbee3857645f8e58686c4fd3ab0",
"version": "16.3.0",

5
versions/l-/llgi.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9ea83fb1cd5fd5ae15c5a1b495a2d6414adce364",
"version-date": "2023-12-19",
"port-version": 2
},
{
"git-tree": "2d5d42fc0ae7751b084503404794be4d108972b4",
"version-date": "2023-12-19",