fix: Ensure project can build with Opam on Windows (#33)

grain-lang · Jan 18, 2022 · 6b297fb · 6b297fb
1 parent 6738f47
commit 6b297fb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git 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,12 +25,16 @@ 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
 
       - name: Build project
         run: opam exec -- dune build
 
       - name: Run tests
-        run: |
-          opam exec -- dune runtest
+        run: opam exec -- dune runtest
diff --git a/dune b/dune
@@ -111,6 +111,7 @@
      -G
      "Unix Makefiles"
      -DCMAKE_CXX_FLAGS=-Wno-unused-variable
+     -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
@@ -18,3 +18,6 @@ depends: [
   "dune-configurator" {>= "2.9.1"}
   "ocaml" {>= "4.12"}
 ]
+depexts: [
+  ["gcc-g++"] { os-distribution = "cygwinports" }
+]