Bring 3rdParty libraries into OMSimulator's CMake build system. #1221
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
mahge
added
enhancement
CI/Update Submodules
mahge
changed the title
- The 3rdParty libraries used to be built as individual standalone projects
and then were installed. The installed versions of them was then consumed
by OMSimulator.
Now they are part of OMSimulators own build system. They get built and
are used as if they were just another folder in the OMSimulator project.
This simplifies management of them considerably.
- There are a few remaining libraries. Some are not used at all so they
are skipped for now. Some (pthreads for MSVC) still need some special
treatment since they do not have CMake support yet.
- Note that the top level compilation still starts from the Makefile
or the bat scripts. This will be changed later once everything else
is working.
- OMTLMSimulator is disabled for now.
mahge
force-pushed
the
improve_cmake_config
branch
from
71405ee
to
028de56
Compare
- This affects how the given INSTALL_DIR is interpreted since it is given
as a relative path.
mahge
force-pushed
the
improve_cmake_config
branch
from
73f6edb
to
4a74547
Compare
- Remove 3rdParty libs that are now part of the unified configuration.
There is no need to build them as standalone modules now.
mahge
force-pushed
the
improve_cmake_config
branch
3 times, most recently
from
01a7d17
to
edb498b
Compare
- For now let it stay the way it was so the tests pass. It can be fixed
later by another set of changes.
- Remove the library architecture directory from the lib install directory.
This will also be added later by another set of changes.
mahge
force-pushed
the
improve_cmake_config
branch
from
edb498b
to
55262ed
Compare
- e.g. `<some_dir>/lib/x86_linux_gnu`.
- Adjust the shell script `OMSimulatorPython` accordingly. It is now
configured from `OMSimulatorPython.in` using CMake. CMake adds the
current library architecture to it.
- If OMSimulator is being build standalone (not as part of OpenModelica)
we include the required settings from the file
`config.cmake/OMSimulatorTopLevelSettings.cmake`, otherwise we use the
settings from the OpenModelica project.
- Require a minimum of CMake 3.14 everywhere (Linux, Windows, macOS ...)
mahge
force-pushed
the
improve_cmake_config
branch
2 times, most recently
from
367465d
to
e4b5a28
Compare
mahge
force-pushed
the
improve_cmake_config
branch
from
e4b5a28
to
9855c0e
Compare
mahge
force-pushed
the
improve_cmake_config
branch
from
3c29edb
to
28e8c3a
Compare
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.
The 3rdParty libraries used to be built as individual standalone projects and then were installed. The installed versions of them was then consumed by OMSimulator.
Now they are part of OMSimulators own build system. They get built and are used as if they were just another folder in the OMSimulator project. This simplifies management of them considerably.
There are a few remaining libraries. Some are not used at all so they are skipped for now. Some (pthreads for MSVC) still need some special treatment since they do not have CMake support yet.
Note that the top level compilation still starts from the Makefile or the bat scripts. This will be changed later once everything else is working.
OMTLMSimulator is disabled for now.