diff --git a/.gitignore b/.gitignore index 5b3453a..ce39770 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,8 @@ .idea cmake-build-*/ - +build/ +CMakeUserPresets.json ### Vim -*.swp \ No newline at end of file +*.swp diff --git a/README.md b/README.md index 5ecc176..d350a30 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,23 @@ libcosimc - OSP C co-simulation API =================================== ![libcosimc CI Conan](https://github.com/open-simulation-platform/libcosimc/workflows/libcosimc%20CI%20Conan/badge.svg) - -This repository contains the OSP C library for co-simulations which wraps and exposes a subset of the [`libcosim`] -library's functions. - + +This repository contains the [OSP] C library for co-simulations, which wraps and +exposes a subset of the [libcosim] C++ library's functions. + See [`CONTRIBUTING.md`] for contributor guidelines and [`LICENSE`] for terms of use. - - + How to build ------------ +Please read the [libcosim build instructions]. The commands you should run +to build libcosimc are exactly the same, except that the option you need to +add to `conan install` to enable [proxy-fmu] support is + `--options="libcosim/*:proxyfmu=True`. -`libcosimc` can be built in the same way as libcosim with the following differences in [step 2] - -To include FMU-proxy support use `-o libcosim:'proxyfmu=True'` when installing dependencies in - - conan install .. -o libcosim:'proxyfmu=True' --build=missing - -When running cmake use `-DLIBCOSIMC_USING_CONAN=TRUE` - [`CONTRIBUTING.md`]: ./CONTRIBUTING.md +[libcosim]: https://github.com/open-simulation-platform/libcosim +[libcosim build instructions]: https://github.com/open-simulation-platform/libcosim#how-to-build [`LICENSE`]: ./LICENSE -[Step 2]: https://github.com/open-simulation-platform/libcosim#step-2-prepare-build-system -[`libcosim`]: https://github.com/open-simulation-platform/libcosim +[OSP]: https://opensimulationplatform.com/ +[proxy-fmu]: https://github.com/open-simulation-platform/proxy-fmu/ diff --git a/conanfile.py b/conanfile.py index 72482d4..492bdb6 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,7 +1,7 @@ import os from conan import ConanFile -from conan.tools.cmake import CMake +from conan.tools.cmake import CMake, cmake_layout from conan.tools.env import VirtualRunEnv from conan.tools.files import load @@ -45,7 +45,7 @@ def configure(self): "doxygen/[>=1.8]", ) requires = ( - "libcosim/0.11.0@osp/testing-feature_conan-2", + "libcosim/0.10.3@osp/stable", "boost/[>=1.71.0]", ) @@ -56,6 +56,9 @@ def configure(self): # Build steps generators = "CMakeDeps", "CMakeToolchain" + def layout(self): + cmake_layout(self) + def build(self): cmake = CMake(self) cmake.configure()