Fix building and installing on Windows

osqp · Nov 15, 2023 · 03f9554 · 03f9554
1 parent 1ee89e8
commit 03f9554
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/make_osqp.m b/make_osqp.m
@@ -70,9 +70,11 @@ function make_osqp(varargin)
         setenv('PATH', [PATH ':/usr/local/bin']);
     end
 
+
+
     %% Configure CMake for the mex interface
     fprintf('  Configuring...' )
-    [status, output] = system( sprintf( 'cmake -B %s -S %s -DMatlab_ROOT_DIR=\"%s\"', osqp_mex_build_dir, osqp_mex_src_dir, Matlab_ROOT ), 'LD_LIBRARY_PATH', '' );
+    [status, output] = system( sprintf( 'cmake -B %s -S %s -DCMAKE_BUILD_TYPE=RelWithDebInfo -DMatlab_ROOT_DIR=\"%s\"', osqp_mex_build_dir, osqp_mex_src_dir, Matlab_ROOT ), 'LD_LIBRARY_PATH', '' );
     if( status )
         fprintf( '\n' );
         disp( output );
@@ -86,7 +88,7 @@ function make_osqp(varargin)
 
     %% Build the mex interface
     fprintf( '  Building...')
-    [status, output] = system( sprintf( 'cmake --build %s', osqp_mex_build_dir ), 'LD_LIBRARY_PATH', '' );
+    [status, output] = system( sprintf( 'cmake --build %s --config Release', osqp_mex_build_dir ), 'LD_LIBRARY_PATH', '' );
     if( status )
         fprintf( '\n' );
         disp( output );
@@ -103,7 +105,11 @@ function make_osqp(varargin)
     fprintf( '  Installing...' )
 
     % Copy mex file to root directory for use
-    [err, errmsg, ~] = copyfile( [osqp_mex_build_dir, filesep, 'osqp_mex.mex*'],  makefile_path );
+    if( ispc )
+        [err, errmsg, ~] = copyfile( [osqp_mex_build_dir, filesep, 'Release', filesep, 'osqp_mex.mex*'],  makefile_path );
+    else
+        [err, errmsg, ~] = copyfile( [osqp_mex_build_dir, filesep, 'osqp_mex.mex*'],  makefile_path );
+    end
     if( ~err )
         fprintf( '\n' )
         disp( errmsg )