[mfl] fix clang build (#30102)

This commit is contained in:
autoantwort 2023-03-10 21:16:47 +01:00 committed by GitHub
parent 0987b1aa01
commit 1f615bcb70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 5 deletions

View File

@ -0,0 +1,13 @@
diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake
index 34f1cc8..bda884d 100644
--- a/cmake/CompilerWarnings.cmake
+++ b/cmake/CompilerWarnings.cmake
@@ -79,7 +79,7 @@ function(set_project_warnings project_name)
if(MSVC)
set(PROJECT_WARNINGS ${MSVC_WARNINGS})
- elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(PROJECT_WARNINGS ${CLANG_WARNINGS})
else()
set(PROJECT_WARNINGS ${GCC_WARNINGS})

View File

@ -12,6 +12,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
disable-tests.patch
fix-clang-detection.patch
)
vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")

View File

@ -1,7 +1,7 @@
{
"name": "mfl",
"version": "0.0.1",
"port-version": 1,
"port-version": 2,
"description": "Computes the layout information for mathematical formulas provided in TeX-like syntax.",
"homepage": "https://github.com/cpp-niel/mfl",
"license": "MIT",

View File

@ -547,9 +547,7 @@ mecab:x86-windows = skip
# Missing dependent libraries.
mesa:x64-linux=fail
mesa:x64-osx=fail
mfl:x64-linux=skip
mfl:x64-osx=skip
mfl:arm64-osx=skip
mfl:x64-linux=fail # requires a c++20 compiler
milerius-sfml-imgui:x64-windows-static=fail
miniupnpc:arm-uwp=fail
miniupnpc:x64-uwp=fail

View File

@ -5050,7 +5050,7 @@
},
"mfl": {
"baseline": "0.0.1",
"port-version": 1
"port-version": 2
},
"mfx-dispatch": {
"baseline": "1.35.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a987e0da7b7b8bee335c9764cf2b8abcc6b68d2a",
"version": "0.0.1",
"port-version": 2
},
{
"git-tree": "5ad7af919e311136c6d46434a2a71b5e064a2d67",
"version": "0.0.1",