Skip to content

Commit

Permalink
[munit] Add new port (#6780)
Browse files Browse the repository at this point in the history
* [munit] Add new port

* [munit] Modernize

* [muint] Update to 2020-04-06

* [munit] Update CI baseline

* [munit] Update CI baseline

* [munit] Fail fast

* [munit] Download meson on linux and osx

* [vcpkg_find_acquire_program] Always download meson if not found

* Revert "[munit] Download meson on linux and osx"

This reverts commit e7e1773.

Co-authored-by: wangli28 <wangli28@beyondsoft.com>
  • Loading branch information
myd7349 and LilyWangL authored May 19, 2020
1 parent 3b0080e commit 3864f7b
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 0 deletions.
5 changes: 5 additions & 0 deletions ports/munit/CONTROL
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Source: munit
Version: 2019-04-06
Description: A small but full-featured unit testing framework for C
Supports: !(arm|arm64|uwp)
Homepage: https://github.com/nemequ/munit
13 changes: 13 additions & 0 deletions ports/munit/fix-install.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/meson.build b/meson.build
index c15b405..44ee737 100644
--- a/meson.build
+++ b/meson.build
@@ -11,7 +11,7 @@ root_include = include_directories('.')

munit = library('munit',
['munit.c'],
- install: meson.is_subproject())
+ install: not meson.is_subproject())

if meson.is_subproject()
munit_dep = declare_dependency(
25 changes: 25 additions & 0 deletions ports/munit/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp")

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO nemequ/munit
REF da8f73412998e4f1adf1100dc187533a51af77fd
SHA512 cd08c1291a73487f15fdba7bf8675fea9177f0ec9766900f65efb5f00c662532a16499447e9087d304de34ff9138f47d04ebf18713f5aa8aacede22c5e23b98b
HEAD_REF master
PATCHES
fix-install.patch
)

vcpkg_configure_meson(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
--backend=ninja
)

vcpkg_install_meson()

vcpkg_copy_pdbs()

file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
8 changes: 8 additions & 0 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1173,6 +1173,14 @@ msmpi:arm-uwp=fail
msmpi:x64-linux=fail
msmpi:x64-osx=fail
msmpi:x64-uwp=fail
munit:arm-uwp=fail
munit:arm64-windows=fail
munit:x64-uwp=fail
# Though `vcpkg_configure_meson` and `vcpkg_install_meson` support
# `x64-linux` and `x64-osx` now, it still failed on these targets.
# See: https://github.com/microsoft/vcpkg/pull/6780
munit:x64-linux=fail
munit:x64-osx=fail
muparser:arm-uwp=fail
muparser:x64-uwp=fail
murmurhash:arm-uwp=fail
Expand Down

0 comments on commit 3864f7b

Please sign in to comment.