diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-01-10 07:21:42 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2020-01-09 15:21:42 -0800 |
| commit | dad1833be46258af233d3461ee965aceaa1f6701 (patch) | |
| tree | e6cda74450b3e8006a46a0ccf6cf9d447b354573 | |
| parent | 1540a0db42fbb69112d84bbf3e78bfa4021cdee6 (diff) | |
| download | vcpkg-dad1833be46258af233d3461ee965aceaa1f6701.tar.gz vcpkg-dad1833be46258af233d3461ee965aceaa1f6701.zip | |
[xmsh]Upgrade version to 0.5.2 and fix build failure. (#7155)
* [xmsh]Upgrade version to 0.5.2 and fix build failure.
* [xmsh]Upgrade to 0.5.2 and add dependency port.
* [xmsh]Add copyright.
| -rw-r--r-- | ports/xmsh/CONTROL | 4 | ||||
| -rw-r--r-- | ports/xmsh/portfile.cmake | 16 |
2 files changed, 16 insertions, 4 deletions
diff --git a/ports/xmsh/CONTROL b/ports/xmsh/CONTROL index 7f53c582c..771abe76f 100644 --- a/ports/xmsh/CONTROL +++ b/ports/xmsh/CONTROL @@ -1,4 +1,4 @@ Source: xmsh -Version: 0.4.1 +Version: 0.5.2 Description: Reference Implementation of XMSH Library -Build-Depends: tl-expected +Build-Depends: tl-expected, nlohmann-json diff --git a/ports/xmsh/portfile.cmake b/ports/xmsh/portfile.cmake index 285205b61..615f8fa9a 100644 --- a/ports/xmsh/portfile.cmake +++ b/ports/xmsh/portfile.cmake @@ -2,11 +2,17 @@ include(vcpkg_common_functions) vcpkg_find_acquire_program(PYTHON3) +if (NOT VCPKG_TARGET_IS_WINDOWS) + message("Building with a gcc version less than 7.1.0 is not supported.") +else() + message(FATAL_ERROR "xmsh only support Linux/OSX.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libxmsh/xmsh - REF v0.4.1 - SHA512 7bd9fe9e565b33722fec37a7e3d9bd8b7b132692add5d26e31954367fb284b49a26a21532ddcb0e425af7f8208e755f21f2d8de81b33ed2a1149724f4ccd2c38 + REF e1900845b796ef977db70519b2ac08eebd788236 #v0.5.2 + SHA512 643c6c94956de9b6fae635b6528e8ba756f4a2bc38de71613c2dd8d47f4a043aee7b6e7fec1870b306be3bea9f5c0c81d1d343bfc27883b3fba986fbc5b15406 HEAD_REF master ) @@ -17,6 +23,10 @@ vcpkg_configure_cmake( -DPYTHON3_EXECUTABLE=${PYTHON3} ) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYPATH ${PYTHON3} PATH) +set(ENV{PATH} "$ENV{PATH};${PYPATH}") + vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) @@ -26,4 +36,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() +file(INSTALL ${SOURCE_PATH}/copyright.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/xmsh RENAME copyright) + vcpkg_copy_pdbs() |