Using proxyfmu/0.4.1 that uses increased frame size (#789)

* Using proxyfmu/0.4.1

Author: davidhjp01

.github/workflows/ci-cmake.yml

@@ -36,6 +36,9 @@ jobs:
               "https://github.com/viproma/debian-fmilib/releases/download/debian%2F2.0.3-1/libfmilib2_2.0.3-1_amd64.deb" \
               "https://github.com/viproma/debian-fmilib/releases/download/debian%2F2.0.3-1/libfmilib2-dev_2.0.3-1_amd64.deb"
           RUN dpkg -i libfmilib2_2.0.3-1_amd64.deb libfmilib2-dev_2.0.3-1_amd64.deb
+          RUN wget --no-check-certificate https://github.com/PJK/libcbor/archive/refs/tags/v0.11.0.tar.gz && \
+                tar xaf v0.11.0.tar.gz && cd libcbor-0.11.0 && \
+                cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON . && make && make install
           COPY entrypoint.sh /
           ENTRYPOINT /entrypoint.sh
           EOF

.github/workflows/ci-conan.yml

@@ -35,6 +35,7 @@ jobs:
           #!/bin/bash -v
           set -eu
           cd /mnt/source
+          pip install conan --upgrade
           conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
           REFNAME="${GITHUB_REF#refs/*/}"
           VERSION="v$(<version.txt)"
@@ -50,6 +51,7 @@ jobs:
             --options="${{ matrix.option_shared }}" \
             --update \
             --build=missing \
+            --build=b2/* \
             --user=osp \
             --channel="${CHANNEL}" \
             .

CMakeLists.txt

@@ -113,7 +113,13 @@ find_package(libzip REQUIRED)
 find_package(Microsoft.GSL REQUIRED)
 find_package(yaml-cpp REQUIRED)
 find_package(XercesC MODULE REQUIRED)
-find_package(libcbor REQUIRED)
+find_package(libcbor)
+
+if (NOT libcbor_FOUND)
+    message(CHECK_START "Could not find libcbor, trying to use system version")
+    find_package(libcbor MODULE REQUIRED)
+endif ()
+
 if(LIBCOSIM_WITH_PROXYFMU)
     find_package(PROXYFMU CONFIG REQUIRED)
 endif()

cmake/Findlibcbor.cmake

@@ -0,0 +1,32 @@
+# FindLibCBOR.cmake
+# Locate libcbor library and headers, and define libcbor::libcbor target
+
+find_path(LIBCBOR_INCLUDE_DIR
+        NAMES cbor.h
+        PATH_SUFFIXES include
+)
+
+find_library(LIBCBOR_LIBRARY
+        NAMES cbor libcbor
+        PATH_SUFFIXES lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(libcbor
+        REQUIRED_VARS LIBCBOR_LIBRARY LIBCBOR_INCLUDE_DIR
+)
+
+if(LIBCBOR_FOUND)
+    set(LIBCBOR_INCLUDE_DIRS ${LIBCBOR_INCLUDE_DIR})
+    set(LIBCBOR_LIBRARIES ${LIBCBOR_LIBRARY})
+
+    if(NOT TARGET libcbor::libcbor)
+        add_library(libcbor::libcbor UNKNOWN IMPORTED)
+        set_target_properties(libcbor::libcbor PROPERTIES
+                IMPORTED_LOCATION "${LIBCBOR_LIBRARY}"
+                INTERFACE_INCLUDE_DIRECTORIES "${LIBCBOR_INCLUDE_DIR}"
+        )
+    endif()
+endif()
+
+mark_as_advanced(LIBCBOR_INCLUDE_DIR LIBCBOR_LIBRARY)

conanfile.py

@@ -47,7 +47,7 @@ def requirements(self):
         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.3.3@osp/testing",
+            self.requires("proxyfmu/0.4.1@osp/stable",
                           transitive_headers=True,
                           transitive_libs=True)
         self.requires("yaml-cpp/[~0.8]")

version.txt

@@ -1 +1 @@
-0.11.0
+0.11.1