Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci-conan-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
image: ${{ matrix.linux }}
options: -u 0
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Install prerequisites
run: |
apt-get update
Expand All @@ -62,4 +62,4 @@ jobs:
--user sintef --channel ${{ matrix.channel }} \
-b missing -b outdated -b "${{ env.pkg_name }}*" .
- name: Conan upload
run: conan upload --confirm -r sintef "${{ env.pkg_name }}*" --force
run: conan upload --confirm -r sintef "${{ env.pkg_name }}*"
4 changes: 2 additions & 2 deletions .github/workflows/ci-conan-msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
compiler_version: [192, 194]
channel: ["${{ github.ref_type == 'tag' && 'stable' || 'testing' }}"]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Install prerequisites
run: |
pip3 install --upgrade setuptools pip
Expand All @@ -41,4 +41,4 @@ jobs:
--user sintef --channel ${{ matrix.channel }} `
-b missing -b outdated -b "${{ env.pkg_name }}*" .
- name: Conan upload
run: conan upload --confirm -r sintef "${{ env.pkg_name }}*" --force
run: conan upload --confirm -r sintef "${{ env.pkg_name }}*"
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,10 @@ for CPPFMU that you can use in your code, but you still need to compile
`fmi_functions.cpp`. The package can be created with `conan create . --user sintef
--channel stable`. The recipe and some precompiled binaries are available on Sintef
Ocean's public artifactory], which can be added with `conan remote add sintef-public
https://package.smd.sintef.no`. Note that when using the conan recipe, FMI 1 or 2 is added
as a dependency, so you do not need to fetch them yourself. To use CPPFMU with conan, add
the following lines to your `conanfile.py` and `CMakeLists.txt`:
https://gitlab.sintef.no/api/v4/projects/22218/packages/conan`. Note that when using the
conan recipe, FMI 1 or 2 is added as a dependency, so you do not need to fetch them
yourself. To use CPPFMU with conan, add the following lines to your `conanfile.py`
and `CMakeLists.txt`:

`conanfile.py`:
```python
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0
1.1.1