Modify embedded code CMake flow #17
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For some reason, Mathworks doesn't have C99 enabled on older linux versions, so it fails on the C++ style // comments.
This relies on the CMake created in the main OSQP repo now.
|
Thanks! I have made equivalent edits in the Python interface. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the complimentary change to the CMake modifications done in the main OSQP repo (osqp/osqp#174) that create a per-source directory CMakeLists.txt file. This allows new files to be added without requiring changes on the embedded code generation side.
This modifies the embedded CMakeLists.txt to reference the new CMakeLists.txt files, and copy them into the generated code folder as well.
There is an additional commit in there to add the C99 flag to the emosqp mex call, since some Matlab versions still don't use it natively (e.g. my R2016b on Linux doesn't).
These should be the only changes needed in the Matlab interface. Python will need the same changes made.