From 3b0e11acd2ffc10f82020a470ede6b2f0e3f8f09 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Sun, 16 Jan 2022 16:42:21 -0700 Subject: [PATCH] Opam Windows work --- .github/workflows/opam.yml | 10 +++++++--- dune | 1 + libbinaryen.opam | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml index cd24903..79673f6 100644 --- a/.github/workflows/opam.yml +++ b/.github/workflows/opam.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest, windows-latest] ocaml-compiler: [4.12.0] steps: @@ -25,6 +25,11 @@ jobs: with: ocaml-compiler: ${{ matrix.ocaml-compiler }} + - name: Inspect depexts + run: | + opam exec -- which python + opam exec -- which cmake + - name: Install local dependencies run: opam install . --deps-only --with-test @@ -32,5 +37,4 @@ jobs: run: opam exec -- dune build - name: Run tests - run: | - opam exec -- dune runtest + run: opam exec -- dune runtest diff --git a/dune b/dune index 11b2b07..aa55f70 100644 --- a/dune +++ b/dune @@ -113,6 +113,7 @@ binaryen -G "Unix Makefiles" + -DCMAKE_SHARED_LIBRARY_PREFIX_CXX=lib -DBUILD_STATIC_LIB=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=binaryen) diff --git a/libbinaryen.opam b/libbinaryen.opam index eb34959..7d7cbd8 100644 --- a/libbinaryen.opam +++ b/libbinaryen.opam @@ -18,3 +18,6 @@ depends: [ "dune-configurator" {>= "2.9.1"} "ocaml" {>= "4.12"} ] +depexts: [ + ["system:python3" "system:cmake" "gcc-g++"] { os-distribution = "cygwinports" } +]