Skip to content

Commit c341f86

Browse files
authored
Addressed failing builds (#207)
* Conan update * Conan update * Conan update * README.md update * libcosimc bump * README.md update * Conanfile update
1 parent 6fe14d4 commit c341f86

File tree

3 files changed

+20
-8
lines changed

3 files changed

+20
-8
lines changed

.github/workflows/ci-cosim-demo-app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
with:
5252
python-version: '3.x'
5353
- name: Install prerequisites
54-
run: pip install conan
54+
run: pip install conan==1.59
5555
- name: Configure libcxx for Linux
5656
run: |
5757
conan profile new default --detect

README.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ Server
99
------------
1010

1111
### Required tools
12+
* Conan v1.59 (currently v2 is not supported)
1213
* Go dev tools: [Golang](https://golang.org/dl/) >= 1.11
13-
* Compiler: [MinGW-w64](https://sourceforge.net/projects/mingw-w64/?source=typ_redirect) (Windows), GCC >= 7 (Linux)
14+
* Compiler: [MinGW-w64](https://sourceforge.net/projects/mingw-w64/?source=typ_redirect) (Windows), GCC >= 9 (Linux)
1415
* Package managers: [Conan](https://conan.io/) and [Go Modules](https://github.com/golang/go/wiki/Modules)
1516

1617
Throughout this guide, we will use Conan to manage C++ dependencies. However, you can also install the C++ dependencies manually.
@@ -25,6 +26,12 @@ Install a current version and specify win32 as thread when requested. Additional
2526
After installing it, you need to add it to the PATH environment variable (add the path where
2627
your MinGW-w64 has been installed to e.g., C:\mingw\mingw64\bin).
2728

29+
Alternatively, MinGW can also be installed via [chocolatey](https://chocolatey.org/install).
30+
Once chocolatey is installed, simply run the following command (as admin) to install MinGW:
31+
```ps
32+
choco install mingw
33+
```
34+
2835
### Step 1: Configure Conan
2936

3037
First, add the OSP Conan repository as a remote and configure the username and
@@ -39,9 +46,11 @@ You can do this in two ways:
3946
#### Alternative 1: Using Conan
4047

4148
From the cosim-demo-app source directory, get C/C++ dependencies using Conan:
42-
43-
conan install . -u -s build_type=Release -g virtualrunenv
44-
go build
49+
```bash
50+
conan install . -u -s build_type=Release -g virtualrunenv
51+
source activate_run.sh # or run activate_run.bat in windows
52+
go build
53+
```
4554

4655
To run the application on Windows:
4756

conanfile.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[generators]
22

33
[requires]
4-
libcosimc/0.10.1@osp/stable
4+
libcosimc/0.10.2@osp/stable
55

66
[options]
77
libcosim:proxyfmu=True
@@ -20,9 +20,10 @@ bin, boost_thread*.dll -> ./dist/bin
2020
bin, cosim*.dll -> ./dist/bin
2121
bin, fmilib_shared.dll -> ./dist/bin
2222
bin, xerces-c*.dll -> ./dist/bin
23-
bin, yaml-cpp.dll -> ./dist/bin
23+
bin, yaml-cpp*.dll -> ./dist/bin
2424
bin, zip.dll -> ./dist/bin
2525
bin, proxyfmu* -> ./dist/bin
26+
bin, fmilibwrapper*.dll -> ./dist/bin
2627

2728
lib, libboost_chrono.so.* -> ./dist/lib
2829
lib, libboost_context.so.* -> ./dist/lib
@@ -35,8 +36,10 @@ lib, libboost_thread.so* -> ./dist/lib
3536
lib, libcosim*.so -> ./dist/lib
3637
lib, libfmilib_shared.so -> ./dist/lib
3738
lib, libxerces-c*.so -> ./dist/lib
38-
lib, libyaml-cpp.so.* -> ./dist/lib
39+
lib, libyaml-cpp*.so.* -> ./dist/lib
3940
lib, libzip.so* -> ./dist/lib
41+
lib, libfmilibwrapper*.so -> ./dist/lib
42+
lib, libproxyfmu-client*.so -> ./dist/lib
4043

4144
., license* -> ./dist/doc/licenses @ folder=True, ignore_case=True, keep_path=False
4245
., */license* -> ./dist/doc/licenses @ folder=True, ignore_case=True, keep_path=False

0 commit comments

Comments
 (0)