Skip to content

Commit

Permalink
[mfl] Fix supports for building on normal triplets (#26951)
Browse files Browse the repository at this point in the history
* fbthrift

* mfl

* version

* Disable tests

* version

* revert fbthrift
  • Loading branch information
Thomas1664 authored Oct 9, 2022
1 parent 4d85e16 commit 3d8c3f5
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 11 deletions.
22 changes: 22 additions & 0 deletions ports/mfl/disable-tests.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c411d11..9336e1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,17 +18,6 @@ include(cmake/StaticAnalyzers.cmake)


add_subdirectory(src)
-add_subdirectory(tests/fonts_for_tests)
-add_subdirectory(tests/unit_tests)
-
-# Building approval tests causes ICE on msvc
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
- add_subdirectory(tests/approval_tests)
-endif()
-
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
- add_subdirectory(tests/fuzz_tests)
-endif()

include(GNUInstallDirs)

14 changes: 6 additions & 8 deletions ports/mfl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@ vcpkg_from_github(
REF v0.0.1
SHA512 a609b4ff23a01e9f9d9bf60bfa6e0b2346b054cf0c27e74e6da574dcfd2a6ead30dcb8464cf03cae2bb9995f15f01ffda5f862c0ec2744a9ad38b856ff27f073
HEAD_REF master
PATCHES
disable-tests.patch
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)

vcpkg_install_cmake()
vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
vcpkg_cmake_install()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mfl)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mfl)

file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
12 changes: 10 additions & 2 deletions ports/mfl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
{
"name": "mfl",
"version": "0.0.1",
"port-version": 1,
"description": "Computes the layout information for mathematical formulas provided in TeX-like syntax.",
"homepage": "https://github.com/cpp-niel/mfl",
"license": "MIT",
"supports": "static",
"dependencies": [
"cairo",
"doctest",
"fmt",
"freetype",
"harfbuzz",
"range-v3"
"range-v3",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4722,7 +4722,7 @@
},
"mfl": {
"baseline": "0.0.1",
"port-version": 0
"port-version": 1
},
"mgnlibs": {
"baseline": "2019-09-29",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mfl.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5ad7af919e311136c6d46434a2a71b5e064a2d67",
"version": "0.0.1",
"port-version": 1
},
{
"git-tree": "a01a0e6d38ab404c3ae58d21d734969a089ef82c",
"version": "0.0.1",
Expand Down

0 comments on commit 3d8c3f5

Please sign in to comment.