fix compilation on windows

PREDICT-EPFL · Nov 1, 2024 · 9a93ce3 · 9a93ce3
1 parent 6190da0
commit 9a93ce3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 0 deletions.
diff --git a/.github/workflows/matlab.yml b/.github/workflows/matlab.yml
@@ -34,6 +34,8 @@ jobs:
         with:
           submodules: 'recursive'
 
+      - uses: ilammy/msvc-dev-cmd@v1
+
       - name: Setup external build directory
         run: mkdir -p build_external
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -28,6 +28,8 @@ jobs:
         with:
           submodules: 'recursive'
 
+      - uses: ilammy/msvc-dev-cmd@v1
+
       - uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest
@@ -45,6 +47,9 @@ jobs:
           # Dependencies
           conda install eigen=${{ matrix.eigen }} libmatio
 
+      - name: Setup external build directory
+        run: mkdir -p build_external
+
       - name: Setup Ninja
         if: runner.os == 'Windows'
         uses: seanmiddleditch/gha-setup-ninja@master

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -46,6 +46,10 @@ jobs:
         with:
           submodules: 'recursive'
 
+      - uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: ${{ matrix.target.arch == 'x86' && 'amd64_x86' || 'amd64' }}
+
       - name: Set up QEMU
         if: runner.os == 'Linux'
         uses: docker/setup-qemu-action@v2

diff --git a/include/piqp/solver.hpp b/include/piqp/solver.hpp
@@ -10,6 +10,7 @@
 #define PIQP_SOLVER_HPP
 
 #include <cstdio>
+#include <memory>
 #include <Eigen/Dense>
 #include <Eigen/Sparse>
 

diff --git a/interfaces/matlab/make_piqp.m b/interfaces/matlab/make_piqp.m
@@ -61,6 +61,7 @@ function make_piqp(varargin)
 % Add arguments to cmake and mex compiler
 cmake_args = [
     '-DBUILD_C_INTERFACE=OFF ' ...
+    '-DBUILD_WITH_TEMPLATE_INSTANTIATION=OFF ' ...
     '-DBUILD_MATLAB_INTERFACE=ON ' ...
     '-DBUILD_TESTS=OFF ' ...
     '-DBUILD_EXAMPLES=OFF ' ...