Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Conan 2 #747

Merged
merged 15 commits into from
Feb 19, 2024
Merged

Upgrade to Conan 2 #747

merged 15 commits into from
Feb 19, 2024

Commits on Nov 7, 2023

  1. Upgrade to Conan 2

    This fixes issue #718 (and incidentally fixes #702 too).
    
    The modified `<gsl/util>` imports and various changes from `int` to
    `std::size_t` are a consequence of using a newer version of MS GSL. I
    changed the dependency version so we can use an upstream CMake package
    configuration file which is compatible with the one generated by Conan
    2's `CMakeDeps` generator. This should enable us to use the same
    `find_package()` commands and target names regardless of whether the
    build is running under Conan or not.
    
    This also removes the ability to run Conan from within CMake, because
    upstream hasn't released a version of the cmake-conan helper script with
    full support for all Conan 2 features yet. (Notably, support for the
    `CMakeToolchain` generator is missing.)
    kyllingstad committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    b1333ef View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9376d49 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Configuration menu
    Copy the full SHA
    76d24fb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c11ccbd View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    46bddf9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5281c3f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0b9dc6f View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. Configuration menu
    Copy the full SHA
    1ac2872 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0244abd View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5271e2d View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. Configuration menu
    Copy the full SHA
    5a899bd View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. Set the cpp_info property cmake_target_name as libcosim::cosim in…

    … the `package_info` method.
    
    This is because otherwise CMakeDeps incorrectly generates the dependency in the target cmake file as `libcosim::libcosim`. (i.e. <consumer>-Target-release.cmake, see https://docs.conan.io/2/reference/tools/cmake/cmakedeps.html#generated-files). This would not be found via `find_package(libcosim REQUIRED)`.
    davidhjp01 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    255692d View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Uploading artifacts to jfrog (#751)

    gcc9 builds are not available from conancenter. Built libraries are uploaded to osp jfrog.
    davidhjp01 authored Feb 15, 2024
    Configuration menu
    Copy the full SHA
    6a5920e View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. Updated proxyfmu

    davidhjp01 committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    6a66249 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6836732 View commit details
    Browse the repository at this point in the history