Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake updates for embedded code generation #174

Merged
merged 6 commits into from
Aug 24, 2019
Merged

CMake updates for embedded code generation #174

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
31bf894
Fix build error when profiling disabled
imciner2 Aug 23, 2019
038bdf3
Refactor CMake so that file lists are made in subfolders
imciner2 Aug 23, 2019
ab0dd62
Add building of embedded to Travis
imciner2 Aug 23, 2019
c54310c
Try to make the solver timeout without printing
imciner2 Aug 23, 2019
31107ed
Move printing to after embedded testing
imciner2 Aug 23, 2019
1b106de
Merge branch 'cmake_fixes' into cmake_fixes
gbanjac Aug 24, 2019
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
Prev Previous commit
Merge branch 'cmake_fixes' into cmake_fixes
  • Loading branch information
@gbanjac
gbanjac authored Aug 24, 2019
commit 1b106de9c8bd8cae756611fd7cd060842a98b442
2 changes: 1 addition & 1 deletion src/osqp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1586,7 +1586,7 @@ c_int osqp_update_verbose(OSQPWorkspace *work, c_int verbose_new) {
c_int osqp_update_time_limit(OSQPWorkspace *work, c_float time_limit_new) {

// Check if workspace has been initialized
if (!work) osqp_error(OSQP_WORKSPACE_NOT_INIT_ERROR);
if (!work) return osqp_error(OSQP_WORKSPACE_NOT_INIT_ERROR);

// Check that time_limit is nonnegative
if (time_limit_new < 0.) {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.