Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
043a717
Enhance CMake configuration for Debug builds and improve error loggin…
davidhjp01 May 15, 2026
c67acb6
Updated
davidhjp01 May 15, 2026
ce8fe89
Merge remote-tracking branch 'origin/bugfix/800-ci-builds-failing' in…
davidhjp01 May 15, 2026
d2b0217
Updated
davidhjp01 May 15, 2026
624c18a
Updated
davidhjp01 May 15, 2026
9ad97aa
Refactor CMake configuration to ensure Release dependencies are used …
davidhjp01 May 15, 2026
c80c83b
Set CMakeDeps configuration to "Release" for Windows builds
davidhjp01 May 15, 2026
e77ea19
Updated
davidhjp01 May 15, 2026
6b7c6d3
Updated
davidhjp01 May 15, 2026
5e2ae9a
Updated
davidhjp01 May 15, 2026
e15713c
Updated
davidhjp01 May 15, 2026
c976200
Update CMake configuration and dependencies for improved compatibility
davidhjp01 May 15, 2026
b26bd3f
Enhance CMake configuration in CI and conanfile for improved dependen…
davidhjp01 May 15, 2026
7727f1d
Updated
davidhjp01 May 15, 2026
c47d4b8
Updated
davidhjp01 May 15, 2026
e6930c1
Updated
davidhjp01 May 15, 2026
cfbec0c
Updated
davidhjp01 May 15, 2026
bd79bab
Updated
davidhjp01 May 15, 2026
875c56b
Updated
davidhjp01 May 15, 2026
fb11c94
Updated
davidhjp01 May 15, 2026
8e03e99
Updated
davidhjp01 May 15, 2026
89b0c95
Updated
davidhjp01 May 15, 2026
eba4384
Updated
davidhjp01 May 15, 2026
071dcd9
Updated
davidhjp01 May 15, 2026
930e8bf
Revert "Updated"
davidhjp01 May 15, 2026
b5c5db6
Remove commented-out configuration mappings in CMakeLists.txt
davidhjp01 May 15, 2026
9c1bbe8
Updated
davidhjp01 May 15, 2026
2a18b02
Reverted back conanfile.py changes
davidhjp01 May 15, 2026
f1b6514
Remove cmake installation from pipx in ci-conan.yml
davidhjp01 May 18, 2026
6851f8b
Update proxyfmu dependency version to 0.4.2 in conanfile.py
davidhjp01 May 18, 2026
7022e33
Remove cmake installation from ci-conan.yml
davidhjp01 May 18, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-conan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Install prerequisites
run: |
apt-get update
apt-get install -y pipx cmake doxygen
apt-get install -y pipx doxygen
pipx install conan
echo "$HOME/.local/bin" >> "$GITHUB_PATH"
- name: Configure Conan
Expand Down
7 changes: 4 additions & 3 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ def set_version(self):

# Dependencies/requirements
def requirements(self):
self.tool_requires("cmake/[>=3.19]")
self.tool_requires("cmake/[>=4.0]")
self.requires("fmilibrary/[~2.3]")
self.requires("libcbor/0.11.0")
self.requires("libzip/[~1.11]")
self.requires("ms-gsl/[>=3 <5]", transitive_headers=True)
self.requires("boost/[~1.85]", transitive_headers=True, transitive_libs=True) # Required by Thrift
if self.options.proxyfmu:
self.requires("proxyfmu/0.4.1@osp/stable",
self.requires("proxyfmu/0.4.2@osp/stable",
transitive_headers=True,
transitive_libs=True)
self.requires("yaml-cpp/[~0.8]")
self.requires("yaml-cpp/[~0.9]")
self.requires("xerces-c/[~3.2]")

# Exports
Expand Down Expand Up @@ -127,3 +127,4 @@ def _is_tests_enabled(self):
"true",
"1",
)

4 changes: 2 additions & 2 deletions src/cosim/observer/file_observer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ class file_observer::slave_value_writer

if (fsw_.fail()) {
std::stringstream error;
error << "Failed to open log file stream: " << filePath.c_str();
error << "Failed to open log file stream: " << filePath.string();
throw std::runtime_error(error.str());
}

Expand Down Expand Up @@ -279,7 +279,7 @@ class file_observer::slave_value_writer

if (fsw_.fail()) {
std::stringstream error;
error << "Failed to open log metadata file stream: " << filePath.c_str();
error << "Failed to open log metadata file stream: " << filePath.string();
throw std::runtime_error(error.str());
}

Expand Down
Loading