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.

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

Update cmake configuration #1247

Merged
merged 2 commits into from
Aug 24, 2023
Merged

Update cmake configuration #1247

merged 2 commits into from
Aug 24, 2023

Conversation

lochel
Copy link
Member

@lochel lochel commented Aug 23, 2023

This makes it easier to include OMSimulator into other project.

Note: OpenModelica will need to define OPENMODELICA_SUPERPROJECT.

@lochel lochel requested a review from mahge August 23, 2023 13:50
@mahge
Copy link
Contributor

mahge commented Aug 23, 2023

I think jenkins uses the Makefile in the testsuite directory to build the dependencies for the test suite. So it should work fine. However, we should be probably enable the testsuite on the CMake configure command in the Jenkinsfile anyway so building the dependencies with CMake is checked as well.

cmake -S . -B build/ -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install/

echo cmake -S . -B build/ -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install/

sh "cmake -S . -B build/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install/"


We should also add the pip option wherever it is needed.

@mahge mahge added the CI/Update Submodules Allow a pull request to update submodules label Aug 23, 2023
@mahge mahge merged commit fd3e750 into OpenModelica:master Aug 24, 2023
2 checks passed
@lochel lochel deleted the cmake branch August 24, 2023 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/Update Submodules Allow a pull request to update submodules
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants