Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish-cvcgl-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
-DCVC_ENABLE_OPENMP=OFF -DDISABLE_CGAL=ON -DCVC_USING_HDF5=OFF \
-DCVC_USING_IMOD_MRC=OFF -DCVC_ENABLE_IMAGEMAGICK=ON -DCVC_ENABLE_FFTW=OFF \
-DCVC_FFT_PROVIDER=none -DCVC_ENABLE_ASSIMP=ON \
-DCVC_ENABLE_MESHER=OFF -DCVC_ENABLE_SDF=ON -DCVC_STATE_EXEC=OFF \
-DCVC_ENABLE_MESHER=OFF -DCVC_ENABLE_SDF=ON -DCVC_STATE_EXEC=ON \
-DCVC_BUILD_CVCGL=ON -DCVC_BUILD_EXAMPLES=OFF -DCVC_WASM_PTHREADS=ON
cmake --build build-wasm --target cvc cvcGL -j"$(nproc)"
cmake --install build-wasm
Expand Down
20 changes: 19 additions & 1 deletion cvcpkg/recipes/libcvc/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,13 @@ recipe:
# and will not compile until 3.4.0+cvc.2 (with the setter) is published. The
# published 3.4.0+cvc.1 predates #433. cvcgl already sits at +cvc.2, so this
# brings the tested-together family back to a single revision.
cvc_revision: 2
# Bumped 2 -> 3 (3.4.0 lineage): republish the family carrying the coef_mlp .cvcnav format v2
# (two-head sigmoid λ_soft/λ_hard, #436). The wasm-mt republish also (a) turns CVC_STATE_EXEC back
# ON for wasm (it was wrongly forced OFF — the state_exec evaluator has no gRPC dependency and must
# always build), and (b) picks up the gRPC/xmlrpc dep guard above so `cvcpkg install cvc/libcvc
# --platform wasm-mt` resolves again. A v2 .cvcnav hard-fails on a pre-v2 host, so hosts (demo3 /
# cvcdbg fleet) must land 3.4.0+cvc.3 before any v2 blob ships.
cvc_revision: 3
maintainer: "cvcpkg group"
maintainer_email: "info@cvcpkg.org"
maintainer_url: "https://cvcpkg.org"
Expand Down Expand Up @@ -235,12 +241,24 @@ depends:
# falls back to `find_dependency(LAPACK)` — which resolves to Accelerate.
- name: openblas
platforms: [linux, freebsd, openbsd, netbsd, windows]
# The gRPC/xmlrpc network state-transport stack (CVC_USING_XMLRPC + CVC_ENABLE_GRPC).
# Scoped to the platforms this recipe actually BUILDS the transport on (the build matrix
# below: linux/macos/windows). The wasm-mt bundle (built separately by publish-cvcgl-wasm.yml,
# xmlrpc/grpc OFF, CVC_STATE_EXEC ON) links none of these, so declaring them for wasm made
# `cvcpkg install cvc/libcvc --platform wasm-mt` fail to resolve (abseil/protobuf/grpc are not
# published for wasm). The state_exec evaluator is independent of this stack and stays on.
- name: openssl
platforms: [linux, macos, windows]
- name: c-ares
platforms: [linux, macos, windows]
- name: re2
platforms: [linux, macos, windows]
- name: abseil
platforms: [linux, macos, windows]
- name: protobuf
platforms: [linux, macos, windows]
- name: grpc
platforms: [linux, macos, windows]
- name: pthreads4w
platforms: [windows]
host_tools:
Expand Down
Loading